X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_email.php;h=104c1c4929513576c549f07a3acc4a6515f3526b;hb=a28d14e1734c945dde3d34ca2be3a8fb638d961f;hp=97ae6e3ac004550fbab0abd8bfe2edbe9c2f1bed;hpb=56110d88ee4c934e38833d90bbd252eaf0b14ab9;p=Pman.Core

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 97ae6e3a..104c1c49 100644
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -41,6 +41,18 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
                 $tn.subject LIKE '%{$this->escape($q['search']['nameortitle'])}%'
             ");
         }
+        
+        $this->selectAdd("
+           (
+            SELECT 
+                count(user_id) 
+            FROM 
+                core_group_member 
+            WHERE 
+                to_group_id = core_group_member.group_id
+            ) 
+            AS group_member_count
+        ");
     }
     
     function beforeDelete($dependants_array, $roo)
@@ -61,6 +73,18 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             $this->makeCopy($roo);
             
         }
+        
+        if ($this->to_group != -1) {
+            $c = DB_DataObject::factory('core_group_member');            
+            $c->whereAdd("group_id = {$this->to_group}");
+                        
+            if (!$c->find(true)) {
+              $roo->jerr('not found');
+              return;  
+            }
+
+            
+        }
     }
     
     function makeCopy($roo)
@@ -345,13 +369,11 @@ 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']);
             }
-            
-            var_dump($content['subject']);
         }
         
         if(!empty($contents['rcpts']) && is_array($contents['rcpts'])){