DataObjects/Core_enum.php

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 2c3c3fa..cf82334 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -288,7 +288,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
      * @param Object|Array $obj Object (or array) to send @see Pman_Core_Mailer
      *    + subject
      *    + rcpts || person   << if person is set - then it goes to them...
-     *    + rcpts_group << for admin emails..
+     *    + rcpts_group (string) << name of group - normally to send admin emails.. (if set, then bcc_group is ignored.)
      *    + replace_links
      *    + template
      *    + mailer_opts
@@ -301,7 +301,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
     
     function toMailer($obj,$force=false)
     {
-        
+        $p = new PEAR();
         $contents = (array)$obj;
 
          
@@ -309,31 +309,34 @@ 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)){
-            $p = new PEAR();
             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('core_group')->lookupMembersByGroupId($this->bcc_group,'email');
             
-            $group = DB_DataObject::factory('groups');
-            $group->get($this->bcc_group);
-            $ar = $group->members('email');
-            if (!empty($ar)) {
-                $contents->bcc = $ar;
+            if (empty($admin)) {
+                return $p->raiseError("template [{$contents['template']}] - bcc group is empty");
             }
+            
+            $contents['bcc'] = $admin ;
         }
         if (!empty($contents['rcpts_group'])) {
             
+            $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");
+            }
+            $contents['rcpts'] = $admin;
         }
         
-        
-       
-        
-        
         if(empty($contents['subject'])){
            $contents['subject'] = $this->subject; 
         }