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

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index e86128b1..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)
@@ -305,21 +329,23 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         
         $p = new PEAR();
         $contents = (array)$obj;
-
-         
+        
         if(empty($this->id) && !empty($contents['template'])){
             $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('core_group')->lookupMembersByGroupId($this->bcc_group,'email');
             
@@ -339,13 +365,20 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             $contents['rcpts'] = $admin;
         }
         
+        //subject replacement
         if(empty($contents['subject'])){
            $contents['subject'] = $this->subject; 
         }
+
+        if (!empty($contents['subject_replace'])) {
+            foreach ($contents['mapping'] as $pattern => $replace) {
+                $contents['subject'] = preg_replace($pattern,$replace,$contents['subject']);
+            }
+        }
         
         if(!empty($contents['rcpts']) && is_array($contents['rcpts'])){
             $contents['rcpts'] = implode(',', $contents['rcpts']);
-        }
+        }     
         
         $ui = posix_getpwuid(posix_geteuid());
         
@@ -356,6 +389,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         }
          
         require_once 'Pman/Core/Mailer.php';
+              
         
         $templateDir = session_save_path() . '/email-cache-' . $ui['name'] ;
         //print_r($this);
@@ -404,6 +438,15 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
     /**
      *
      * DEPRICATED !!! - DO NOT USE THIS !!!
+     *
+     * use: toMailerData() -- to return the email data..
+     * or
+     * $mailer = $core_email->toMailer($obj, false);
+     * $sent = is_a($mailer,'PEAR_Error') ? false : $mailer->send();
+
+     * toMailer($obj, false)->send()
+     *
+     * 
      */
     
     function send($obj, $force = true, $send = true)
@@ -412,30 +455,6 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             return $this->toMailerData($obj,$force);
         }
         
-        if(!empty($obj['rcpts_gp'])) {
-            $rcpts = $obj['rcpts_gp'];
-            if (strpos($obj['rcpts_gp'], '@') == false) {
-                $rcpts = array();
-                $gp = DB_DataObject::factory('core_group');
-                $gp->get('name', $obj['rcpts_gp']);
-                foreach ($gp->members() as $v) {
-                    $rcpts[] = $v->email;
-                }
-                $obj['rcpts'] = $rcpts;
-            }
-        }
-        
-        if (!empty($obj['is_subject_replace'])) {
-            $mapping = array(
-                '/{person.name}/' => $obj['person']->name
-            );
-            $subject = $obj['subject'];
-            foreach ($mapping as $pattern => $replace) {
-                $subject = preg_replace($pattern,$replace,$subject);
-            }
-            $obj['subject'] = $subject;
-        }
-        
         $r = $this->toMailer($obj, $force);
         
         if (is_a($r, 'PEAR_Error')) {