DataObjects/Core_email.php

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 51094f6..68d8ba5 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -88,6 +88,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             $c->group_id = $this->to_group_id;
                         
             if (!$c->count()) {
+                //cannot go to second check
                 if (!empty($request['_ignore_group_count'])) {
                     if (!$request['_ignore_group_count']) {
                         $roo->jerr('no_member',array('errcode'=> 100));
@@ -359,7 +360,7 @@ 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)) {
@@ -387,6 +388,11 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             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']);
+                }
+            }
         }
         
         if(!empty($contents['rcpts']) && is_array($contents['rcpts'])){
@@ -656,7 +662,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);