Changeset 604 for branches/1.1dev/lib

Timestamp:

May 8, 2017 2:34:08 PM (7 years ago)

Author:

anonymous

Message:

Backport improved logMsg from codebase v2.2.0-7

File:

• branches/1.1dev/lib/App.inc.php (modified) (4 diffs)

branches/1.1dev/lib/App.inc.php

@@ -96 +96 @@
     }
 
+    // In case __FILE__ and __LINE__ are not provided, note that fact.
+    $file = '' == $file ? 'unknown-file' : $file;
+    $line = '' == $line ? 'unknown-line' : $line;
+
+    // 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));
@@ -109 +117 @@
         'message'   => $message
     );
-
-    $event_str = strip_tags('[' . preg_replace('/\s{2,}/', ' ', join('] [', $event)) . ']');
+    // Here's a shortened version of event data.
+    $event_short = $event;
+    $event_short['url'] = truncate($event_short['url'], 120);
 
     // FILE ACTION
     if ($CFG->log_file_priority && $priority <= $CFG->log_file_priority) {
+        $event_str = '[' . join('] [', $event_short) . ']';
         error_log($event_str . "\n", 3, $CFG->log_directory . '/' . $CFG->log_filename);
     }
@@ -122 +132 @@
             $CFG->log_to_email = 'bug@strangecode.com';
         }
-        $subject = sprintf('[%s %s] %s', getenv('HTTP_HOST'), $event['type'], $message);
-        $email_msg = sprintf("A %s log event occured on %s\n\n", $event['type'], getenv('HTTP_HOST'));
+        $hostname = (isset($_SERVER['HTTP_HOST']) && '' != $_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : php_uname('n');
+        $subject = sprintf('[%s %s] %s', $hostname, $event['type'], mb_substr($event['message'], 0, 64));
+        $email_msg = sprintf("A log event of type '%s' occurred on %s\n\n", $event['type'], $hostname);
         $headers = "From: codebase@strangecode.com\r\n";
         foreach ($event as $k=>$v) {
@@ -136 +147 @@
             $CFG->log_to_sms = 'bug@strangecode.com';
         }
-        $subject = '[' . getenv('HTTP_HOST') . ' log event]';
-        $headers = "From: codebase@strangecode.com\r\n";
-        mail($CFG->log_to_sms, $subject, $event_str, $headers, '-f codebase@strangecode.com');
+        $hostname = (isset($_SERVER['HTTP_HOST']) && '' != $_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : php_uname('n');
+        $subject = sprintf('[%s %s]', $hostname, $priority);
+        $sms_msg = sprintf('%s [%s:%s]', mb_substr($event_short['message'], 0, 64), basename($file), $line);
+        $headers = 'From: ' . $this->getParam('site_email');
+        mb_send_mail($CFG->log_to_sms, $subject, $sms_msg, $headers);
     }