Changeset 43

Timestamp:

Dec 18, 2005 12:38:31 AM (18 years ago)

Author:

scdev

Message:

${1}

Location:

trunk

Files:

• lib/Auth_SQL.inc.php (modified) (3 diffs)
• lib/Email.inc.php (modified) (1 diff)
• tests/_config.inc.php (modified) (1 diff)

trunk/lib/Auth_SQL.inc.php

@@ -12 +12 @@
 define('AUTH_ENCRYPT_SHA1', 'sha1');
 define('AUTH_ENCRYPT_PLAINTEXT', 'plaintext');
+
+require_once dirname(__FILE__) . '/Email.inc.php';
 
 class Auth_SQL {
@@ -747 +749 @@
         }
 
-        // Make sure user has an email on record.
+        // Get new password.
+        $password = $this->generatePassword();
+
+        // Update password query.
+        $this->setPassword($user_id, $password);
+
+        // Make sure user has an email on record before continuing.
         if (!isset($user_data['email']) || '' == trim($user_data['email'])) {
             App::logMsg(sprintf('Password reset but notification failed, no email address for %s %s (%s).', $this->_auth, $user_data[$this->_params['db_primary_key']], $user_data[$this->_params['db_username_column']]), LOG_NOTICE, __FILE__, __LINE__);
-        }
-
-        // Get new password.
-        $password = $this->generatePassword();
-
-        // Update password query.
-        $this->setPassword($user_id, $password);
-
-        // Body for email.
-        $email_body = <<<EOF
+        } else {
+            // Body for email.
+            $email_body = <<<EOF
 Hello {NAME},
 
@@ -775 +776 @@
 
 EOF;
-
-        $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->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();
+            $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->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

@@ -226 +226 @@
 
         // Ensure required values exist.
-        if (!isset($this->_template)) {
-            App::logMsg(sprintf('Cannot send email. Template not set.', null), LOG_ERR, __FILE__, __LINE__);
+        if (!isset($this->_params['subject'])) {
+            App::logMsg(sprintf('Cannot send email to %s. SUBJECT not defined.', $this->_params['to']), LOG_ERR, __FILE__, __LINE__);
+            return false;
+        } else if (!isset($this->_template)) {
+            App::logMsg(sprintf('Cannot send email: "%s". Template not set.', $this->_params['subject']), LOG_ERR, __FILE__, __LINE__);
             return false;
         } else if (!isset($this->_params['to'])) {
-            App::logMsg(sprintf('Cannot send email. TO not defined.', null), LOG_ERR, __FILE__, __LINE__);
+            App::logMsg(sprintf('Cannot send email: "%s". TO not defined.', $this->_params['subject']), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         } else if (!isset($this->_params['from'])) {
-            App::logMsg(sprintf('Cannot send email. FROM not defined.', null), LOG_ERR, __FILE__, __LINE__);
-            return false;
-        } else if (!isset($this->_params['subject'])) {
-            App::logMsg(sprintf('Cannot send email. SUBJECT not defined.', null), LOG_ERR, __FILE__, __LINE__);
+            App::logMsg(sprintf('Cannot send email: "%s". FROM not defined.', $this->_params['subject']), LOG_ERR, __FILE__, __LINE__);
             return false;
         }

trunk/tests/_config.inc.php

@@ -27 +27 @@
     'log_filename' => 'codebase_test_log',
     'log_file_priority' => LOG_DEBUG,
-    'log_screen_priority' => LOG_INFO,
+    'log_screen_priority' => LOG_WARNING,
     'error_reporting' => E_ALL,
 ));