ZP-386 #comment cache logs when user is not yet authenticated and write them...

ZP-386 #comment cache logs when user is not yet authenticated and write them to the user log afterwards #time 1h

git-svn-id: https://z-push.org/svn/z-push/trunk@1662 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

src/lib/core/zlog.php

@@ -48,6 +48,8 @@ class ZLog {
     static private $pidstr;
     static private $wbxmlDebug = '';
     static private $lastLogs = array();
+    static private $userLog = false;
+    static private $unAuthCache = array();
 
     /**
      * Initializes the logging
@@ -65,10 +67,11 @@ class ZLog {
         if (!defined('LOGLEVEL'))
             define('LOGLEVEL', LOGLEVEL_OFF);
 
-        list($user,) = Utils::SplitDomainUser(Request::GetGETUser());
+        list($user,) = Utils::SplitDomainUser(strtolower(Request::GetGETUser()));
+        self::$userLog = in_array($user, $specialLogUsers);
         if (!defined('WBXML_DEBUG') && $user) {
             // define the WBXML_DEBUG mode on user basis depending on the configurations
-            if (LOGLEVEL >= LOGLEVEL_WBXML || (LOGUSERLEVEL >= LOGLEVEL_WBXML && in_array($user, $specialLogUsers)))
+            if (LOGLEVEL >= LOGLEVEL_WBXML || (LOGUSERLEVEL >= LOGLEVEL_WBXML && self::$userLog))
                 define('WBXML_DEBUG', true);
             else
                 define('WBXML_DEBUG', false);
@@ -80,7 +83,7 @@ class ZLog {
             self::$user = '';
 
         // log the device id if the global loglevel is set to log devid or the user is in  and has the right log level
-        if (Request::GetDeviceID() != "" && (LOGLEVEL >= LOGLEVEL_DEVICEID || (LOGUSERLEVEL >= LOGLEVEL_DEVICEID && in_array($user, $specialLogUsers))))
+        if (Request::GetDeviceID() != "" && (LOGLEVEL >= LOGLEVEL_DEVICEID || (LOGUSERLEVEL >= LOGLEVEL_DEVICEID && self::$userLog)))
             self::$devid = '['. Request::GetDeviceID() .'] ';
         else
             self::$devid = '';
@@ -105,11 +108,25 @@ class ZLog {
             @file_put_contents(LOGFILE, $data, FILE_APPEND);
         }
 
-        if ($loglevel <= LOGUSERLEVEL && self::logToUserFile()) {
+        // should we write this into the user log?
+        if ($loglevel <= LOGUSERLEVEL && self::$userLog) {
             // padd level for better reading
             $data = str_replace(self::getLogLevelString($loglevel), self::getLogLevelString($loglevel,true), $data);
-            // only use plain old a-z characters for the generic log file
-            @file_put_contents(LOGFILEDIR . self::logToUserFile() . ".log", $data, FILE_APPEND);
+
+            // is the user authenticated?
+            if (self::logToUserFile()) {
+                // something was logged before the user was authenticated, write this to the log
+                if (!empty(self::$unAuthCache)) {
+                    @file_put_contents(LOGFILEDIR . self::logToUserFile() . ".log", implode('', self::$unAuthCache), FILE_APPEND);
+                    self::$unAuthCache = array();
+                }
+                // only use plain old a-z characters for the generic log file
+                @file_put_contents(LOGFILEDIR . self::logToUserFile() . ".log", $data, FILE_APPEND);
+            }
+            // the user is not authenticated yet, we save the log into memory for now
+            else {
+                self::$unAuthCache[] = $data;
+            }
         }
 
         if (($loglevel & LOGLEVEL_FATAL) || ($loglevel & LOGLEVEL_ERROR)) {