Changeset 732 for trunk/lib

Timestamp:

Aug 8, 2020 10:13:07 PM (4 years ago)

Author:

anonymous

Message:

Update logMsg email

File:

• trunk/lib/App.inc.php (modified) (4 diffs)

trunk/lib/App.inc.php

@@ -980 +980 @@
         $event_short['url'] = truncate($event_short['url'], 120);
 
-        // Restore original locale.
-        setlocale(LC_TIME, $locale);
+        // Email info.
+        $hostname = ('' != $this->getParam('site_hostname')) ? $this->getParam('site_hostname') : php_uname('n');
+        $headers = sprintf("From: %s\nX-File: %s\nX-Line: %s", $this->getParam('site_email'), $file, $line);
 
         // FILE ACTION
@@ -990 +991 @@
 
         // EMAIL ACTION
-        if (false !== $this->getParam('log_email_priority') && $priority <= $this->getParam('log_email_priority') && $send_notifications) {
-            $hostname = ('' != $this->getParam('site_hostname')) ? $this->getParam('site_hostname') : php_uname('n');
+        if (false !== $this->getParam('log_email_priority') && $priority <= $this->getParam('log_email_priority') && '' != $this->getParam('log_to_email_address') && $send_notifications) {
             $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: ' . $this->getParam('site_email');
             foreach ($event as $k=>$v) {
                 $email_msg .= sprintf("%-16s %s\n", $k, $v);
@@ -1004 +1003 @@
 
         // SMS ACTION
-        if (false !== $this->getParam('log_sms_priority') && $priority <= $this->getParam('log_sms_priority') && $send_notifications) {
-            $hostname = ('' != $this->getParam('site_hostname')) ? $this->getParam('site_hostname') : php_uname('n');
-            $subject = sprintf('[%s %s]', $hostname, $priority);
+        if (false !== $this->getParam('log_sms_priority') && $priority <= $this->getParam('log_sms_priority') && '' != $this->getParam('log_to_sms_address') && $send_notifications) {
+            $subject = sprintf('[%s %s]', $hostname, $this->logPriorityToString($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($this->getParam('log_to_sms_address'), $subject, $sms_msg, $headers);
         }
@@ -1016 +1013 @@
             file_put_contents('php://stderr', "[{$event['type']}] [{$event['message']}]\n", FILE_APPEND);
         }
+
+        // Restore original locale.
+        setlocale(LC_TIME, $locale);
 
         return true;