Changeset 629

Timestamp:

May 13, 2018 3:23:03 PM (6 years ago)

Author:

anonymous

Message:

Add log_serialize parameter

Location:

trunk

Files:

• docs/version.txt (modified) (1 diff)
• lib/App.inc.php (modified) (3 diffs)

trunk/docs/version.txt

@@ -1 @@
-2.2.2-0
+2.2.2-2

trunk/lib/App.inc.php

@@ -195 +195 @@
         'log_message_max_length' => 1024,
 
+        // Strip line-endings from log messages.
+        'log_serialize' => true,
+
         // Temporary files directory.
         'tmp_dir' => '/tmp',
@@ -394 +397 @@
                         $this->setParam(json_decode(file_get_contents($db_auth_file), true));
                     } else {
-                        $this->logMsg(sprintf('Unable to read DB auth file: %s', $db_auth_file), LOG_ALERT, __FILE__, __LINE__);
+                        $this->logMsg(sprintf('Unable to read DB auth file: %s', $db_auth_file), LOG_NOTICE, __FILE__, __LINE__);
                     }
                 } else {
-                    $this->logMsg(sprintf('DB auth file not found: %s', $this->getParam('db_auth_file')), LOG_ALERT, __FILE__, __LINE__);
+                    $this->logMsg(sprintf('DB auth file not found: %s', $this->getParam('db_auth_file')), LOG_NOTICE, __FILE__, __LINE__);
                 }
             }
@@ -811 +814 @@
         }
 
-        // Strip HTML tags except any with more than 7 characters because that's probably not a HTML tag, e.g. <email@address.com>.
-        preg_match_all('/(<[^>\s]{7,})[^>]*>/', $message, $strip_tags_allow);
-        $message = strip_tags(preg_replace('/\s+/', ' ', $message), (!empty($strip_tags_allow[1]) ? join('> ', $strip_tags_allow[1]) . '>' : null));
-
-        // Serialize multi-line messages.
-        $message = preg_replace('/\s+/m', ' ', trim($message));
+        if ($this->getParam('log_serialize')) {
+            // Serialize multi-line messages.
+            $message = preg_replace('/\s+/m', ' ', trim($message));
+        }
 
         // Store this event under a unique key, counting each time it occurs so that it only gets reported a limited number of times.