Changeset 41

Timestamp:

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

Author:

scdev

Message:

${1}

Location:

trunk/lib

Files:

• App.inc.php (modified) (5 diffs)
• Auth_SQL.inc.php (modified) (1 diff)
• Email.inc.php (modified) (3 diffs)
• Utilities.inc.php (modified) (3 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');
         }

trunk/lib/Auth_SQL.inc.php

@@ -757 +757 @@
         // Update password query.
         $this->setPassword($user_id, $password);
-        
-        // Subject for email. Do not use double-quote marks inside.
-        $email_subject = sprintf('%s password change', App::getParam('site_name'));
-        
-        // Body for email. Do not touch lines with 'EOF'.
+
+        // Body for email.
         $email_body = <<<EOF
-Hello %s,
-
-Your password at %s has been reset. %s
+Hello {NAME},
+
+Your password at {SITE_NAME} has been reset. {REASON}
 Your new login information is:
 
-USERNAME: %s
-PASSWORD: %s
-
-If you have any questions or concerns please reply to this email or go the the address below.
+USERNAME: {USERNAME}
+PASSWORD: {PASSWORD}
+
+If you have any questions or concerns please reply to this email or visit the website below.
 
 Thank you,
-%s
-%s
+{SITE_NAME}
+{SITE_URL}/
 
 EOF;
-        $email_body = wordwrap(sprintf($email_body, 
-            $user_data[$this->_params['db_username_column']],
-            App::getParam('site_name'),
-            $reason,
-            $user_data[$this->_params['db_username_column']],
-            $password,
-            App::getParam('site_name'),
-            App::getParam('site_url')
+
+        $email = new Email(array(
+            'to' => $user_data['email'],
+            'from' => sprintf('%s <%s>', App::getParam('site_name'), App::getParam('site_email')),
+            'subject' => sprintf('%s password change', App::getParam('site_name'))
         ));
-
-        // Email the user with the new account information.
-        mail($user_data['email'], $email_subject, $email_body, sprintf("From: %s <%s>\r\n", App::getParam('site_name'), App::getParam('site_email')), App::getParam('envelope_sender_address'));
+        $email->setString($email_body);
+        $email->replace(array(
+            'site_name' => App::getParam('site_name'),
+            'site_url' => App::getParam('site_url'),
+            'name' => ('' != $user_data['first_name'] . $user_data['last_name'] ? $user_data['first_name'] . ' ' . $user_data['last_name'] : $user_data[$this->_params['db_username_column']]),
+            'username' => $user_data[$this->_params['db_username_column']],
+            'password' => $password,
+            'reason' => $reason,
+        ));
+        $email->send();
     
         return array(

trunk/lib/Email.inc.php

@@ -16 +16 @@
 ));
 $email->setTemplate('email_registration_confirm.ihtml');
+// $email->setString('Or you can pass your message body as a string, also with {VARIABLES}.');
 $email->replace(array(
     'site_name' => App::getParam('site_name'),
@@ -153 +154 @@
     {
         // Load file, using include_path.
-        if ('' == $string) {
+        if ('' == trim($string)) {
             App::logMsg(sprintf('Empty string provided.', null), LOG_ERR, __FILE__, __LINE__);
             $this->_template_replaced = null;
             return false;
         } else {
-            $_template = $string;
+            $this->_template = $string;
             // This could be a new template, so reset the _template_replaced.
             $this->_template_replaced = null;
@@ -244 +245 @@
         // Ensure all placeholders have been replaced. Find anything with {...} characters.
         if (preg_match('/({[^}]+})/', $final_body, $unreplaced_match)) {
-            App::logMsg(sprintf('Cannot send email. Variables left unreplaced in template: %s', (isset($unreplaced_match) ? $unreplaced_match[1] : '')), LOG_ERR, __FILE__, __LINE__);
+            App::logMsg(sprintf('Cannot send email. Variables left unreplaced in template: %s', (isset($unreplaced_match[1]) ? $unreplaced_match[1] : '')), LOG_ERR, __FILE__, __LINE__);
             return false;
         }

trunk/lib/Utilities.inc.php

@@ -516 +516 @@
     }
     if (isset($_POST[$var])) {
-        return dispelMagicQuotes($_POST[$var]);
+        return trim(dispelMagicQuotes($_POST[$var]));
     } else if (isset($_GET[$var])) {
-        return dispelMagicQuotes($_GET[$var]);
+        return trim(dispelMagicQuotes($_GET[$var]));
     } else {
         return $default;
@@ -526 +526 @@
 {
     if (is_null($var)) {
-        return dispelMagicQuotes($_POST);
+        return trim(dispelMagicQuotes($_POST));
     }
     if (isset($_POST[$var])) {
-        return dispelMagicQuotes($_POST[$var]);
+        return trim(dispelMagicQuotes($_POST[$var]));
     } else {
         return $default;
@@ -537 +537 @@
 {
     if (is_null($var)) {
-        return dispelMagicQuotes($_GET);
+        return trim(dispelMagicQuotes($_GET));
     }
     if (isset($_GET[$var])) {
-        return dispelMagicQuotes($_GET[$var]);
+        return trim(dispelMagicQuotes($_GET[$var]));
     } else {
         return $default;