X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_email.php;h=63dab85d5d7d11f1cf1e4c2922767f389105f417;hb=a6943c3659175253922638be72a789d205b31441;hp=ee2ae835dd717a8663eb5b55d5e52f5639eea3a4;hpb=39a4eadb6adcbf6e786f62a89ea31d7956c5c486;p=Pman.Core

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index ee2ae835..63dab85d 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)) {
+                if (!empty($request['_ignore_group_count']) && !$request['_ignore_group_count']) {
+        	   	     $roo->jerr('not found');
+        	       }	                                
+            }
+        }
     }
     
     function makeCopy($roo)
@@ -306,8 +330,6 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         $p = new PEAR();
         $contents = (array)$obj;
         
-        var_dump($content);
-        
         if(empty($this->id) && !empty($contents['template'])){
             $this->get('name', $contents['template']);
         }
@@ -348,9 +370,9 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
            $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']);
             }
         }