Changeset 422

Timestamp:

Aug 11, 2013 8:50:44 PM (11 years ago)

Author:

anonymous

Message:

 

Location:

trunk/lib

Files:

• App.inc.php (modified) (2 diffs)
• Email.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -666 +666 @@
         // EMAIL ACTION
         if (false !== $this->getParam('log_email_priority') && $priority <= $this->getParam('log_email_priority') && $send_notifications) {
-            $subject = sprintf('[%s %s] %s', getenv('HTTP_HOST'), $event['type'], mb_substr($message, 0, 64));
-            $email_msg = sprintf("A %s log event occurred 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($message, 0, 64));
+            $email_msg = sprintf("A %s log event occurred on %s\n\n", $event['type'], $hostname);
             $headers = 'From: ' . $this->getParam('site_email');
             foreach ($event as $k=>$v) {
@@ -677 +678 @@
         // SMS ACTION
         if (false !== $this->getParam('log_sms_priority') && $priority <= $this->getParam('log_sms_priority') && $send_notifications) {
-            $subject = sprintf('[%s %s]', getenv('HTTP_HOST'), $priority);
+            $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['message'], 0, 64), basename($file), $line);
             $headers = 'From: ' . $this->getParam('site_email');

trunk/lib/Email.inc.php

@@ -192 +192 @@
         $app =& App::getInstance();
     
-        // Load file, using include_path.
         if ('' == trim($string)) {
             $app->logMsg(sprintf('Empty string provided.', null), LOG_ERR, __FILE__, __LINE__);