DataObjects/Core_company.php

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 46da220..78f2146 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core_email
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_email extends DB_DataObject 
 {
@@ -309,30 +309,33 @@ 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');
-//            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('groups')->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($this->bcc_group) && empty($contents['rcpts_group'])) {
+            $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 ;
+        }
+        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; 
@@ -434,7 +437,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         fwrite($fh, implode("\n", array(
             "From: {if:t.messageFrom}{t.messageFrom:h}{else:}{t.messageFrom():h}{end:}",
             "To: {if:t.person}{t.person.getEmailFrom():h}{else:}{rcpts:h}{end:}",
-            "Subject: {t.subject} ",
+            "Subject: {t.subject:h} ",
             "X-Message-ID: {t.id} ",
             "{if:t.replyTo}Reply-To: {t.replyTo:h}{end:}",
             "{if:t.mailgunVariables}X-Mailgun-Variables: {t.mailgunVariables:h}{end:}"