X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_email.php;h=de91473dfe3d38d9ad668eb21d6839fe63bba33e;hb=1c49b447ea70bc1b855e1f8d27352e4cb16a900b;hp=400d34d31a76bfec8e7b1479e6b7300feb7011bc;hpb=568e7eda07c8bcfb7cdc41168a319692472c3635;p=Pman.Core

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 400d34d3..de91473d 100644
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -301,27 +301,25 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
     
     function toMailer($obj,$force=false)
     {
-    	
-    	
         require_once 'PEAR.php';
         
         $p = new PEAR();
         $contents = (array)$obj;
-
+        
         if(empty($this->id) && !empty($contents['template'])){
             $this->get('name', $contents['template']);
         }
+             
         
         if(empty($this->active)){
             return $p->raiseError("template [{$contents['template']}] is Disabled");
         }
         
+        
         if(empty($this->id)){
             return $p->raiseError("template [{$contents['template']}] has not been set");
         }
         
-        var_dump('die');exit;
-        
         // fill in BCC
         
         if (!empty($this->bcc_group) && empty($contents['rcpts_group'])) {
@@ -343,9 +341,16 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             $contents['rcpts'] = $admin;
         }
         
+        //subject replacement
         if(empty($contents['subject'])){
            $contents['subject'] = $this->subject; 
         }
+
+        if (!empty($contents['subject_replace'])) {
+            foreach ($contents['mapping'] as $pattern => $replace) {
+                $contents['subject'] = preg_replace($pattern,$replace,$contents['subject']);
+            }
+        }
         
         if(!empty($contents['rcpts']) && is_array($contents['rcpts'])){
             $contents['rcpts'] = implode(',', $contents['rcpts']);
@@ -411,7 +416,11 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
      * DEPRICATED !!! - DO NOT USE THIS !!!
      *
      * use: toMailerData() -- to return the email data..
-     * or toMailer($obj, false)->send()
+     * or
+     * $mailer = $core_email->toMailer($obj, false);
+     * $sent = is_a($mailer,'PEAR_Error') ? false : $mailer->send();
+
+     * toMailer($obj, false)->send()
      *
      * 
      */