Changeset 41 for trunk/lib/App.inc.php

Timestamp:

Dec 17, 2005 9:11:26 AM (19 years ago)

Author:

scdev

Message:

${1}

File:

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

trunk/lib/App.inc.php

@@ -119 +119 @@
         'log_to_sms_address' => null,
         
-        // The from address used for system emails.
-        'envelope_sender_address' => '',
-    
         // A key for calculating simple cryptographic signatures. Set using as an environment variables in the httpd.conf with 'SetEnv SIGNING_KEY <key>'.
         'signing_key' => 'aae6abd6209d82a691a9f96384a7634a',
@@ -314 +311 @@
         // and is used whenever a URL need be used to the current site.
         // Not available on cli scripts obviously.
-        if (isset($_SERVER['HTTP_HOST']) && '' != $_SERVER['HTTP_HOST'] && '' != $this->getParam('site_url')) {
+        if (isset($_SERVER['HTTP_HOST']) && '' != $_SERVER['HTTP_HOST'] && '' == $this->getParam('site_url')) {
             $this->setParam(array('site_url' => sprintf('%s://%s', ('on' == getenv('HTTPS') ? 'https' : 'http'), getenv('HTTP_HOST'))));
         }
@@ -323 +320 @@
         }
         
-        // Used as the fifth parameter to mail() to set the return address for sent messages. Requires safe_mode off.
-        if ('' != $this->getParam('site_email') && !$this->getParam('envelope_sender_address')) {
-            $this->setParam(array('envelope_sender_address' => '-f ' . $this->getParam('site_email')));
-        }
-
         // Character set. This should also be printed in the html header template.
         header('Content-type: text/html; charset=' . $this->getParam('character_set'));
@@ -496 +488 @@
             $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'));
-            $headers = "From: codebase@strangecode.com\r\n";
+            $headers = "From: codebase@strangecode.com";
             foreach ($event as $k=>$v) {
                 $email_msg .= sprintf("%-11s%s\n", $k, $v);
@@ -506 +498 @@
         if ($this->getParam('log_sms_priority') && $priority <= $this->getParam('log_sms_priority')) {
             $subject = sprintf('[%s %s]', getenv('HTTP_HOST'), $priority);
-            $sms_msg = sprintf('%s:%s %s', basename($file), $line, $event['message']);
-            $headers = "From: codebase@strangecode.com\r\n";
+            $sms_msg = sprintf('%s [%s:%s]', $event['message'], basename($file), $line);
+            $headers = "From: codebase@strangecode.com";
             mail($this->getParam('log_to_sms_address'), $subject, $sms_msg, $headers, '-f codebase@strangecode.com');
         }