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

Timestamp:

Dec 30, 2014 10:24:51 PM (9 years ago)

Author:

anonymous

Message:

Many minor fixes during pulso development

File:

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

trunk/lib/Email.inc.php

@@ -53 +53 @@
 */
 
-class Email {
+class Email
+{
 
     // Default parameters, to be overwritten by setParam() and read with getParam()
@@ -244 +245 @@
     }
 
+    /*
+    * Returns the body of the current email. This can be used to store the message that is being sent.
+    * It will use the original template, or the replaced template if it has been processed.
+    *
+    * @access   public
+    * @return   string  Message body.
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @version  1.0
+    * @since    18 Nov 2014 21:15:19
+    */
+    public function getBody()
+    {
+        $final_body = isset($this->_template_replaced) ? $this->_template_replaced : $this->_template;
+        // Ensure all placeholders have been replaced. Find anything with {...} characters.
+        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__);
+            return false;
+        }
+        return $final_body;
+    }
+
     /**
      * Send email using PHP's mail() function.
@@ -295 +318 @@
         // Ensure all placeholders have been replaced. Find anything with {...} characters.
         if (preg_match('/({[^}]+})/', $final_body, $unreplaced_match)) {
-            $app->logMsg(sprintf('Cannot send email. At least one variable left unreplaced in template: %s', (isset($unreplaced_match[1]) ? $unreplaced_match[1] : '')), LOG_ERR, __FILE__, __LINE__);
+            unset($unreplaced_match[0]);
+            $app->logMsg(sprintf('Cannot send email. Unreplaced variables in template: %s', getDump($unreplaced_match)), LOG_ERR, __FILE__, __LINE__);
             return false;
         }