sync

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 9662968..170c2a1 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -21,11 +21,10 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
     public $owner_id;
     public $is_system;
     public $active;
-    public $bcc_group;
+    public $bcc_group_id;
     public $test_class;
     
-
-    
+ 
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -41,6 +40,27 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
                 $tn.subject LIKE '%{$this->escape($q['search']['nameortitle'])}%'
             ");
         }
+        $cgm = DB_DataObject::Factory('core_group_member')->tableName();;
+      
+        $this->selectAdd("
+            (
+                SELECT 
+                    count(id) 
+                FROM 
+                    {$cgm}
+                WHERE 
+                    to_group_id = {$cgm}.group_id
+            )  AS group_member_count,
+            
+            (
+                SELECT 
+                    count(id) 
+                FROM 
+                    {$cgm}
+                WHERE 
+                    bcc_group_id = {$cgm}.group_id
+            )  AS bcc_group_member_count
+        ");
     }
     
     function beforeDelete($dependants_array, $roo)
@@ -61,6 +81,23 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             $this->makeCopy($roo);
             
         }
+        
+        if ($this->to_group_id != -1) {
+                  
+            $c = DB_DataObject::factory('core_group_member');            
+            $c->group_id = $this->to_group_id;
+                        
+            if (!$c->count()) {
+                if (!empty($request['_ignore_group_count'])) {
+                    if (!$request['_ignore_group_count']) {
+                        $roo->jerr('no_member',array('errcode'=> 100));
+                    }
+                } else {
+                    $roo->jerr('no_member',array('errcode'=> 100));
+                }
+            }
+            
+        }
     }
     
     function makeCopy($roo)
@@ -322,8 +359,8 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         
         // fill in BCC
         
-        if (!empty($this->bcc_group) && empty($contents['rcpts_group'])) {
-            $admin = DB_DAtaObject::Factory('core_group')->lookupMembersByGroupId($this->bcc_group,'email');
+        if (!empty($this->bcc_group_id) && empty($contents['rcpts_group'])) {
+            $admin = DB_DAtaObject::Factory('core_group')->lookupMembersByGroupId($this->bcc_group_id,'email');
             
             if (empty($admin)) {
                 return $p->raiseError("template [{$contents['template']}] - bcc group is empty");
@@ -345,10 +382,10 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         if(empty($contents['subject'])){
            $contents['subject'] = $this->subject; 
         }
-        
-        if (!empty($content['subject_replace'])) {
-            foreach ($content['mapping'] as $pattern => $replace) {
-                $content['subject'] = preg_replace($pattern,$replace,$content['subject']);
+
+        if (!empty($contents['subject_replace'])) {
+            foreach ($contents['mapping'] as $pattern => $replace) {
+                $contents['subject'] = preg_replace($pattern,$replace,$contents['subject']);
             }
         }
         
@@ -391,6 +428,10 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             $cfg = array_merge($contents['mailer_opts'], $cfg);
         }
         
+        if(isset($contents['css_inline'])){
+            $cfg['css_inline'] = $contents['css_inline'];
+        }
+        
         $r = new Pman_Core_Mailer($cfg);
         
         $imageCache = session_save_path() . '/email-cache-' . $ui['name'] . '/mail/' . $this->tableName() . '-' . $this->id . '-images.txt';