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

Timestamp:

Jun 8, 2018 3:41:16 AM (6 years ago)

Author:

anonymous

Message:

Disable App::sslOn(). Better logging on Email::send() unreplaced variables. Fix the elusive 'Database table session_tbl has invalid columns' error.

File:

• trunk/lib/Email.inc.php (modified) (5 diffs)

trunk/lib/Email.inc.php

@@ -78 +78 @@
     );
 
+    // String that contains filename of the template used (for logging).
+    protected $_template_filename;
+
     // String that contains the email body.
     protected $_template;
@@ -198 +201 @@
         // This could be a new template, so reset the _template_replaced.
         $this->_template_replaced = null;
+
+        $this->_template_filename = $template;
+
         return true;
     }
@@ -221 +227 @@
             // This could be a new template, so reset the _template_replaced.
             $this->_template_replaced = null;
+
+            $this->_template_filename = '(using Email::setString)';
+
             return true;
         }
@@ -281 +290 @@
         if (preg_match('/({[^}]+})/', $final_body, $unreplaced_match)) {
             unset($unreplaced_match[0]);
-            $app->logMsg(sprintf('Cannot get email body. Unreplaced variables in template: %s', getDump($unreplaced_match)), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot get email body. Unreplaced variable %s in template %s', getDump($unreplaced_match)), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -339 +348 @@
         if (preg_match('/({[^}]+})/', $final_body, $unreplaced_match)) {
             unset($unreplaced_match[0]);
-            $app->logMsg(sprintf('Cannot send email. Unreplaced variables in template: %s', getDump($unreplaced_match)), LOG_ERR, __FILE__, __LINE__);
-            return false;
+            $app->logMsg(sprintf('Unreplaced variable "%s" in template "%s"', getDump($unreplaced_match), $this->_template_filename), LOG_ERR, __FILE__, __LINE__);
         }