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

Timestamp:

Jul 1, 2006 12:25:24 AM (18 years ago)

Author:

scdev

Message:

Q - Added reset_password service. Fixed some bugs. Change the interface of humanTime() (it was called timeElapsed).

File:

• trunk/lib/Auth_SQL.inc.php (modified) (2 diffs)

trunk/lib/Auth_SQL.inc.php

@@ -845 +845 @@
             $app->logMsg(sprintf('Password reset but notification failed, no email address for user %s (%s).', $user_data[$this->_params['db_primary_key']], $user_data[$this->_params['db_username_column']]), LOG_NOTICE, __FILE__, __LINE__);
         } else {
-            // Body for email.
-            $email_body = <<<EOF
-Hello {NAME},
-
-Your password at {SITE_NAME} has been reset. {REASON}
-Your new login information is:
-
-USERNAME: {USERNAME}
-PASSWORD: {PASSWORD}
-
-If you have any questions or concerns please reply to this email or visit the website below.
-
-Thank you,
-{SITE_NAME}
-{SITE_URL}/
-
-EOF;
+            // Send the new password in an email.
             $email = new Email(array(
                 'to' => $user_data['email'],
@@ -867 +851 @@
                 'subject' => sprintf('%s password change', $app->getParam('site_name'))
             ));
-            $email->setString($email_body);
+            $email->setTemplate('codebase/services/templates/email_reset_password.txt');
             $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,
+                'SITE_NAME' => $app->getParam('site_name'),
+                'SITE_URL' => $app->getParam('site_url'),
+                'SITE_EMAIL' => $app->getParam('site_email'),
+                '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' => ('' == trim($reason) ? '' : trim($reason) . ' '), // Add a space after the reason if it exists for better fromatting.
             ));
             $email->send();