add_log_line() be used from command line scripts without errors

This commit is contained in:
Uwe Steinmann 2019-02-14 12:45:39 +01:00
parent 4b7e9d9c75
commit 6d5ce06c9f

View File

@ -343,14 +343,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'];
if($user) if(!empty($_SERVER["REQUEST_URI"]))
$logger->log($user->getLogin()." (".$ip.") ".basename($_SERVER["REQUEST_URI"], ".php").($msg ? ' '.$msg : ''), $priority); $scriptname = basename($_SERVER["REQUEST_URI"], ".php");
else else
$logger->log("-- (".$ip.") ".basename($_SERVER["REQUEST_URI"], ".php").($msg ? ' '.$msg : ''), $priority); $scriptname = basename($_SERVER["SCRIPT_NAME"], ".php");
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="") { /* {{{ */