Changeset 43 for trunk/lib/Email.inc.php

Timestamp:

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

Author:

scdev

Message:

${1}

File:

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

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;
         }