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

Timestamp:

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

Author:

scdev

Message:

${1}

File:

• trunk/lib/Auth_SQL.inc.php (modified) (1 diff)

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(