DataObjects/Core_email.php

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 49cfa2e..45e8036 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,15 +40,16 @@ 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(user_id) 
             FROM 
-                core_group_member 
+                {$cgm}
             WHERE 
-                to_group_id = core_group_member.group_id
+                to_group_id = {$cgm}.group_id
             ) 
             AS group_member_count,
             
@@ -57,9 +57,9 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             SELECT 
                 count(user_id) 
             FROM 
-                core_group_member 
+                {$cgm}
             WHERE 
-                bcc_group = core_group_member.group_id
+                bcc_group_id = {$cgm}.group_id
            ) 
            AS bcc_group_member_count
         ");
@@ -84,14 +84,21 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             
         }
         
-        if ($this->to_group != -1) {
+        if ($this->to_group_id != -1) {
                   
             $c = DB_DataObject::factory('core_group_member');            
-            $c->whereAdd("group_id = {$this->to_group}");
+            $c->group_id = $this->to_group_id;
                         
-            if (!$c->count() && !$request['_ignore_group_count']) {
-                $roo->jerr('no_member',array('errcode'=> 100));
+            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));
+                }
             }
+            
         }
     }
     
@@ -354,8 +361,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");
@@ -423,6 +430,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';
@@ -525,7 +536,7 @@ Content-Transfer-Encoding: 7bit
         if (!file_exists(dirname($cachePath))) {
             mkdir(dirname($cachePath), 0700, true);
         }
-        
+        print_R($this->bodytext);exit;
         file_put_contents($cachePath, $this->bodytext);
         
     }