From 3a81d22e8b51054c4a5f2f8e64481df98b17496d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 15 Oct 2021 13:53:16 +0200 Subject: [PATCH] backport addLogLine from 6.0.x --- inc/inc.Utils.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php index 671002d49..43cb098e8 100644 --- a/inc/inc.Utils.php +++ b/inc/inc.Utils.php @@ -406,17 +406,19 @@ function add_log_line($msg="", $priority=null) { /* {{{ */ if(!$logger) return; + $ip = "-"; if(!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) $ip = $_SERVER['HTTP_X_FORWARDED_FOR']; - else + elseif(!empty($_SERVER['REMOTE_ADDR'])) $ip = $_SERVER['REMOTE_ADDR']; -# $tmp = explode('?', $_SERVER['REQUEST_URI']); -# $path = basename($tmp[0]).(isset($tmp[1]) ? '?'.$tmp[1] : ''); - $path = $_SERVER['REQUEST_URI']; - if($user) - $logger->log($user->getLogin()." (".$ip.") ".$path.($msg ? $msg : ''), $priority); + if(!empty($_SERVER["REQUEST_URI"])) + $scriptname = basename($_SERVER["REQUEST_URI"]).' '; 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="") { /* {{{ */