X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_email.php;h=a195235a16f8a4fc7fa8ea3d6037683dce75c07e;hb=50361255510ee3d4f807ae06ff137a9153dcb87c;hp=4f7f05d3dc2d3630abf568ddf25b0b8d5d069b5b;hpb=9c011f3696a7822273be61ffdb56ab6d87a61907;p=Pman.Core diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php index 4f7f05d3..a195235a 100644 --- 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,29 @@ 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 + {$cgm} + WHERE + to_group_id = {$cgm}.group_id + ) + AS group_member_count, + + ( + SELECT + count(user_id) + FROM + {$cgm} + WHERE + bcc_group_id = {$cgm}.group_id + ) + AS bcc_group_member_count + "); } function beforeDelete($dependants_array, $roo) @@ -61,6 +83,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) @@ -91,7 +130,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject $map[$i->id] = $new_image->id; } - + print_r('test??');exit; libxml_use_internal_errors (true); $doc = new DOMDocument('1.0', 'UTF-8'); $doc->loadHTML(''.$this->bodytext.''); @@ -306,34 +345,24 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject $p = new PEAR(); $contents = (array)$obj; - var_dump($content);exit; - - if (!empty($obj['subject_replace'])) { - $mapping = array( - '/{person.name}/' => $obj['person']->name - ); - $subject = $obj['subject']; - foreach ($mapping as $pattern => $replace) { - $subject = preg_replace($pattern,$replace,$subject); - } - $content['subject'] = $subject; - } - 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'); + + 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"); @@ -351,13 +380,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()); @@ -368,6 +404,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); @@ -393,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'; @@ -418,7 +459,11 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject * DEPRICATED !!! - DO NOT USE THIS !!! * * use: toMailerData() -- to return the email data.. - * or toMailer($obj, false)->send() + * or + * $mailer = $core_email->toMailer($obj, false); + * $sent = is_a($mailer,'PEAR_Error') ? false : $mailer->send(); + + * toMailer($obj, false)->send() * * */ @@ -491,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); }