DataObjects/Core_email.php

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index a5ef129..6034883 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -360,10 +360,10 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         
         // fill in BCC
         
-        if (!empty($this->bcc_group_id) && empty($contents['rcpts_group'])) {
+        if (!empty($this->bcc_group_id) && $this->bcc_group_id > 0 && empty($contents['rcpts_group'])) {
             $admin = DB_DAtaObject::Factory('core_group')->lookupMembersByGroupId($this->bcc_group_id,'email');
             
-            if (!empty($admin)) {
+            if (empty($admin)) {
                 return $p->raiseError("template [{$contents['template']}] - bcc group is empty");
             }
             
@@ -385,8 +385,15 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         }
 
         if (!empty($contents['subject_replace'])) {
-            foreach ($contents['mapping'] as $pattern => $replace) {
-                $contents['subject'] = preg_replace($pattern,$replace,$contents['subject']);
+            if (isset($contents['mapping'])) {
+                foreach ($contents['mapping'] as $pattern => $replace) {
+                    $contents['subject'] = preg_replace($pattern,$replace,$contents['subject']);
+                }
+            }
+            foreach ($contents as $k => $v) {
+                if (is_string($v)) {
+                    $contents['subject'] = str_replace('{'. $k . '}', $v, $contents['subject']);
+                }
             }
         }
         
@@ -657,7 +664,7 @@ Content-Transfer-Encoding: 7bit
         if (!empty($master)) {
             $opts['master'] = $mail_template_dir . $master .'.html';
         }
-        print_r($opts);
+        //print_r($opts);
         require_once 'Pman/Core/Import/Core_email.php';
         $x = new Pman_Core_Import_Core_email();
         $x->get('', $opts);