X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_email.php;h=34d2591be36bf0998d1f25eae4d4499bdde65e79;hp=a882342ce49f987ddb5f3cbd020bf0c91d02dba7;hb=39538dd1c71297fb385a26c1aead204229558d44;hpb=9d42f788f4db4941480a56a2ba97aaf472f70b27 diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php index a882342c..34d2591b 100644 --- a/DataObjects/Core_email.php +++ b/DataObjects/Core_email.php @@ -43,26 +43,29 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject $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(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 + ( + SELECT + count(id) + FROM + {$cgm} + WHERE + bcc_group_id = {$cgm}.group_id + ) AS bcc_group_member_count "); + + if (!empty($_REQUEST['_hide_system_emails'])) { + $this->whereAddIn("!{$this->tableName()}.name", array('EVENT_ERRORS_REPORT'), 'string'); + } + } function beforeDelete($dependants_array, $roo) @@ -89,16 +92,9 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject $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)); - } + if (!$c->count() && empty($request['_ignore_group_count'])) { + $roo->jerr('Failed to create email template - No member found in recieptent group',array('errcode'=> 100)); } - } } @@ -264,6 +260,10 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject if (!$replace_links) { continue; } + if (empty($cfg)) { + continue; + } + // not available if server_baseurl not set... and crm module not used. $link = DB_DataObject::factory('crm_mailing_list_link'); $link->setFrom(array( 'url' => $href @@ -283,7 +283,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject } - if(!empty($unsubscribe)){ + if(!empty($unsubscribe) && !empty($cfg)){ $element = $doc->createElement('img'); $element->setAttribute('mailembed', 'no'); $element->setAttribute('src', $cfg ['server_baseurl'] . '/Crm/Open/' . $this->id . '/{person.id}.html'); @@ -361,10 +361,11 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject // fill in BCC - if (!empty($this->bcc_group_id) && empty($contents['rcpts_group'])) { - $admin = DB_DAtaObject::Factory('core_group')->lookupMembersByGroupId($this->bcc_group_id,'email'); + if (!empty($this->bcc_group_id) && $this->bcc_group_id > 0 && empty($contents['bcc']) && empty($contents['rcpts_group'])) { + $admin_grp = DB_DAtaObject::Factory('core_group')->load($this->bcc_group_id); + $admin = $admin_grp->members('email'); - if (empty($admin)) { + if (empty($admin) && $admin_grp->name != 'Empty Group') { // allow 'empty group mname' return $p->raiseError("template [{$contents['template']}] - bcc group is empty"); } @@ -384,10 +385,20 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject 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']); + + // do not use the mapping + if (isset($contents['mapping'])) { + foreach ($contents['mapping'] as $pattern => $replace) { + $contents['subject'] = preg_replace($pattern,$replace,$contents['subject']); + } + } + + foreach ($contents as $k => $v) { + if (is_string($v)) { + $contents['subject'] = str_replace('{'. $k . '}', $v, $contents['subject']); + } } } @@ -404,11 +415,8 @@ 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); - $cfg = array( 'template'=> $this->tableName() . '-' . $this->id, @@ -417,7 +425,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject 'contents' => $contents, 'css_embed' => true, // we should always try and do this with emails... ); - print_R($cfg);exit; + if (isset($contents['rcpts'])) { $cfg['rcpts'] = $contents['rcpts']; } @@ -537,8 +545,20 @@ Content-Transfer-Encoding: 7bit mkdir(dirname($cachePath), 0700, true); } - file_put_contents($cachePath, $this->bodytext); + if (empty($this->use_file)) { + file_put_contents($cachePath, $this->bodytext); + return; + } + // use-file -- uses the original template... + $mailtext = file_get_contents($this->use_file); + + require_once 'Mail/mimeDecode.php'; + require_once 'Mail/RFC822.php'; + $decoder = new Mail_mimeDecode($mailtext); + $parts = $decoder->getSendArray(); + file_put_contents($cachePath,$parts[2]); + } function cachedImages() @@ -586,6 +606,17 @@ Content-Transfer-Encoding: 7bit return false; } + if (!empty($this->use_file)) { + $ctime = filemtime($cachePath); + $mtime = filemtime($this->use_file); + if($ctime >= $mtime){ + return true; + } + return false; + + } + + $ctime = filemtime($cachePath); $mtime = array(); @@ -635,7 +666,7 @@ Content-Transfer-Encoding: 7bit if (!empty($master)) { $opts['master'] = $mail_template_dir . $master .'.html'; } - print_r($opts); + //print_r($opts); require_once 'Pman/Core/Import/Core_email.php'; $x = new Pman_Core_Import_Core_email(); $x->get('', $opts);