DataObjects/Core_project.php

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 23a1770..cf82334 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -309,22 +309,27 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             $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");
         }
         
         // fill in BCC
         if (!empty($this->bcc_group) && empty($contents['rcpts_group'])) {
-             $admin = DB_DAtaObject::Factory('groups')->lookupMembers($this->bcc_group,'email');
+            $admin = DB_DAtaObject::Factory('core_group')->lookupMembersByGroupId($this->bcc_group,'email');
+            
             if (empty($admin)) {
                 return $p->raiseError("template [{$contents['template']}] - bcc group is empty");
             }
-            $contents->bcc = $admin ;
+            
+            $contents['bcc'] = $admin ;
         }
         if (!empty($contents['rcpts_group'])) {
             
-            $admin = DB_DAtaObject::Factory('groups')->lookupMembers($contents['rcpts_group'],'email');
+            $admin = DB_DAtaObject::Factory('core_group')->lookupMembers($contents['rcpts_group'],'email');
             
             if (empty($admin)) {
                 return $p->raiseError("Trying to send to {$contents['rcpts_group']} - group is empty");
@@ -332,8 +337,6 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             $contents['rcpts'] = $admin;
         }
         
-         
-        
         if(empty($contents['subject'])){
            $contents['subject'] = $this->subject; 
         }