X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_email.php;h=03b9072184b46919f9789805db0cebf2bc2f5d92;hp=5bdaa0639f37390d272f8b564398a34979921b81;hb=c8c28ad4fd428d676f271af4142af913d47f755a;hpb=8f0410336f731d0d30d252ca7c966d12f14adefd diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php index 5bdaa063..03b90721 100644 --- a/DataObjects/Core_email.php +++ b/DataObjects/Core_email.php @@ -61,6 +61,11 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject 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) @@ -87,17 +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()) { - //cannot go to second check - 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)); } - } } @@ -266,6 +263,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject 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 @@ -285,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'); @@ -363,9 +361,10 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject // fill in BCC - if (!empty($this->bcc_group_id) && $this->bcc_group_id > 0 && empty($contents['rcpts_group'])) { + 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'); + + $admin = $admin_grp ? $admin_grp->members('email') : false; if (empty($admin) && $admin_grp->name != 'Empty Group') { // allow 'empty group mname' return $p->raiseError("template [{$contents['template']}] - bcc group is empty"); @@ -387,13 +386,16 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject if(empty($contents['subject'])){ $contents['subject'] = $this->subject; } - + if (!empty($contents['subject_replace'])) { + + // 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']); @@ -414,11 +416,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,