DataObjects/I18n.php

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 5b5abf2..cf4cbdb 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -269,9 +269,13 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         if(empty($this->id)){
             return PEAR::raiseError("template [{$contents['template']}]has not been set");
         }
-//        if(empty($contents['subject'])){
+        if(empty($contents['subject'])){
            $contents['subject'] = $this->subject; 
-//        }
+        }
+        
+        if(!empty($contents['rcpts']) && is_array($contents['rcpts'])){
+            $contents['rcpts'] = implode(',', $contents['rcpts']);
+        }
         
         $ui = posix_getpwuid(posix_geteuid());
         
@@ -300,7 +304,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         }
         
         $ret = $r->toData();
-        print_r($ret);exit;
+        
         if(!$send){
             return $ret;
         }
@@ -331,10 +335,10 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
 
         fwrite($fh, implode("\n", array(
             "From: {if:t.messageFrom}{t.messageFrom:h}{else:}{t.messageFrom():h}{end:}",
-            "To: {if:t.person}{t.person.getEmailFrom():h}{else:}{foreach:rcpts,v}{v:h},{end:}{end:}",
-            "{if:t.replyTo}Reply-To: {t.replyTo:h}{end:}",
+            "To: {if:t.person}{t.person.getEmailFrom():h}{else:}{rcpts:h}{end:}",
             "Subject: {t.subject} ",
-            "X-Message-ID: {t.id} "
+            "X-Message-ID: {t.id} ",
+            "{if:t.replyTo}Reply-To: {t.replyTo:h}{end:}"
         ))."\n");