backport addLogLine from 6.0.x

This commit is contained in:
Uwe Steinmann 2021-10-15 13:53:16 +02:00
parent fdfad0ccc8
commit 3a81d22e8b

View File

@ -406,17 +406,19 @@ function add_log_line($msg="", $priority=null) { /* {{{ */
if(!$logger) return; if(!$logger) return;
$ip = "-";
if(!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) if(!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
$ip = $_SERVER['HTTP_X_FORWARDED_FOR']; $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
else elseif(!empty($_SERVER['REMOTE_ADDR']))
$ip = $_SERVER['REMOTE_ADDR']; $ip = $_SERVER['REMOTE_ADDR'];
# $tmp = explode('?', $_SERVER['REQUEST_URI']); if(!empty($_SERVER["REQUEST_URI"]))
# $path = basename($tmp[0]).(isset($tmp[1]) ? '?'.$tmp[1] : ''); $scriptname = basename($_SERVER["REQUEST_URI"]).' ';
$path = $_SERVER['REQUEST_URI'];
if($user)
$logger->log($user->getLogin()." (".$ip.") ".$path.($msg ? $msg : ''), $priority);
else else
$logger->log("-- (".$ip.") ".$path.($msg ? $msg : ''), $priority); $scriptname = basename($_SERVER["SCRIPT_NAME"]).' ';
if($user)
$logger->log($user->getLogin()." (".$ip.") ".$scriptname.($msg ? $msg : ''), $priority);
else
$logger->log("-- (".$ip.") ".$scriptname.($msg ? $msg : ''), $priority);
} /* }}} */ } /* }}} */
function _add_log_line($msg="") { /* {{{ */ function _add_log_line($msg="") { /* {{{ */