ZP-765 Fixed missing spaces in log string. Fixed LOGLEVEL_DEVICEID so it

works as expected. Fixed access of Log->unauthMessageCache - is now an
instance variable. Fixed indentation. Throw a
FatalNotImplementedException instead of a simple Exception.

Released under the Affero GNU General Public License (AGPL) version 3.

src/lib/core/zlog.php

@@ -163,7 +163,7 @@ class ZLog {
             global $specialLogUsers; // This variable comes from the configuration file (config.php)
             $logger = LOGBACKEND;
             if (!class_exists($logger)) {
-                throw new \Exception('The class `'.$logger.'` does not exist.');
+                throw new FatalNotImplementedException('The logging class `'.$logger.'` does not exist.');
             }
 
             list($user) = Utils::SplitDomainUser(strtolower(Request::GetGETUser()));

src/lib/log/filelog.php

@@ -80,9 +80,9 @@ class FileLog extends Log {
      * @return string
      */
     public function BuildLogString($loglevel, $message) {
-        $log = Utils::GetFormattedTime() . $this->GetPidstr() . $this->GetLogLevelString($loglevel, $loglevel >= LOGLEVEL_INFO) . ' ' . $this->GetUser();
-        if ($loglevel >= LOGLEVEL_DEVICEID) {
-            $log .= $this->GetDevid();
+        $log = Utils::GetFormattedTime() . ' ' . $this->GetPidstr() . ' ' . $this->GetLogLevelString($loglevel, $loglevel >= LOGLEVEL_INFO) . ' ' . $this->GetUser();
+        if (LOGLEVEL >= LOGLEVEL_DEVICEID || (LOGUSERLEVEL >= LOGLEVEL_DEVICEID && $this->IsAuthUserInSpecialLogUsers())) {
+            $log .= ' ' . $this->GetDevid();
         }
         $log .= ' ' . $message;
         return $log;

src/lib/log/log.php

@@ -233,7 +233,7 @@ abstract class Log {
                     foreach ($this->unauthMessageCache as $authcache) {
                         $this->WriteForUser($authcache[0], $authcache[1]);
                     }
-                    self::$unAuthCache = array();
+                    $this->unauthMessageCache = array();
                 }
                 $this->WriteForUser($loglevel, $message);
             }
@@ -275,15 +275,15 @@ abstract class Log {
         else
             $s = "";
         switch($loglevel) {
-            case LOGLEVEL_OFF:     return ""; break;
-            case LOGLEVEL_FATAL: return "[FATAL]"; break;
-            case LOGLEVEL_ERROR: return "[ERROR]"; break;
-            case LOGLEVEL_WARN:    return "[".$s."WARN]"; break;
-            case LOGLEVEL_INFO:    return "[".$s."INFO]"; break;
-            case LOGLEVEL_DEBUG: return "[DEBUG]"; break;
-            case LOGLEVEL_WBXML: return "[WBXML]"; break;
-            case LOGLEVEL_DEVICEID: return "[DEVICEID]"; break;
-            case LOGLEVEL_WBXMLSTACK: return "[WBXMLSTACK]"; break;
+            case LOGLEVEL_OFF:          return ""; break;
+            case LOGLEVEL_FATAL:        return "[FATAL]"; break;
+            case LOGLEVEL_ERROR:        return "[ERROR]"; break;
+            case LOGLEVEL_WARN:         return "[".$s."WARN]"; break;
+            case LOGLEVEL_INFO:         return "[".$s."INFO]"; break;
+            case LOGLEVEL_DEBUG:        return "[DEBUG]"; break;
+            case LOGLEVEL_WBXML:        return "[WBXML]"; break;
+            case LOGLEVEL_DEVICEID:     return "[DEVICEID]"; break;
+            case LOGLEVEL_WBXMLSTACK:   return "[WBXMLSTACK]"; break;
         }
     }