DataObjects/Core_notify.php

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index a6f0d9c..83d846c 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -289,7 +289,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         
         if(empty($this->id)){
             $p = new PEAR();
-            return $p->raiseError("template [{$contents['template']}]has not been set");
+            return $p->raiseError("template [{$contents['template']}] has not been set");
         }
         if(empty($contents['subject'])){
            $contents['subject'] = $this->subject; 
@@ -310,14 +310,18 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         require_once 'Pman/Core/Mailer.php';
         
         $templateDir = session_save_path() . '/email-cache-' . $ui['name'] ;
-        print_r($this);
-        $r = new Pman_Core_Mailer(array(
+        //print_r($this);
+        $cfg = array(
             'template'=> $this->tableName() . '-' . $this->id,
             'templateDir' => $templateDir,
             'page' => $this,
-            'rcpts' => $contents['rcpts'],
             'contents' => $contents
-        ));
+        );
+        if (isset($contents['rcpts'])) {
+            $cfg['rcpts'] = $contents['rcpts'];
+        }
+        
+        $r = new Pman_Core_Mailer($cfg);
         
         $imageCache = session_save_path() . '/email-cache-' . $ui['name'] . '/mail/' . $this->tableName() . '-' . $this->id . '-images.txt';
         
@@ -361,7 +365,8 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             "To: {if:t.person}{t.person.getEmailFrom():h}{else:}{rcpts:h}{end:}",
             "Subject: {t.subject} ",
             "X-Message-ID: {t.id} ",
-            "{if:t.replyTo}Reply-To: {t.replyTo:h}{end:}"
+            "{if:t.replyTo}Reply-To: {t.replyTo:h}{end:}",
+            "{if:t.mailgunVariables}X-Mailgun-Variables: {t.mailgunVariables:h}{end:}"
         ))."\n");
         
         
@@ -457,7 +462,10 @@ Content-Transfer-Encoding: 7bit
     
     function messageFrom()
     {
-        return '"' . addslashes($this->from_name) . '" <' . $this->from_email. '>'  ;
+        if (empty($this->from_name)) {
+            return trim($this->from_email);
+        }
+        return trim('"' . addslashes($this->from_name) . '" <' . $this->from_email. '>')  ;
     }
     
     function formatDate($dt, $format = 'd/M/Y')