projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_email.php
[Pman.Core]
/
DataObjects
/
Core_email.php
diff --git
a/DataObjects/Core_email.php
b/DataObjects/Core_email.php
index
23a1770
..
eac40bf
100644
(file)
--- a/
DataObjects/Core_email.php
+++ b/
DataObjects/Core_email.php
@@
-2,7
+2,7
@@
/**
* Table Definition for core_email
*/
/**
* Table Definition for core_email
*/
-require_once 'DB/DataObject.php';
+
class_exists('DB_DataObject') ? '' :
require_once 'DB/DataObject.php';
class Pman_Core_DataObjects_Core_email extends DB_DataObject
{
class Pman_Core_DataObjects_Core_email extends DB_DataObject
{
@@
-301,30
+301,39
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
function toMailer($obj,$force=false)
{
function toMailer($obj,$force=false)
{
+ require_once 'PEAR.php';
+
$p = new PEAR();
$contents = (array)$obj;
$p = new PEAR();
$contents = (array)$obj;
-
-
+
if(empty($this->id) && !empty($contents['template'])){
$this->get('name', $contents['template']);
}
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)){
if(empty($this->id)){
-
return $p->raiseError("template [{$contents['template']}] has not been set");
}
// fill in BCC
return $p->raiseError("template [{$contents['template']}] has not been set");
}
// fill in BCC
+
if (!empty($this->bcc_group) && empty($contents['rcpts_group'])) {
if (!empty($this->bcc_group) && empty($contents['rcpts_group'])) {
- $admin = DB_DAtaObject::Factory('groups')->lookupMembers($this->bcc_group,'email');
+ $admin = DB_DAtaObject::Factory('core_group')->lookupMembersByGroupId($this->bcc_group,'email');
+
if (empty($admin)) {
return $p->raiseError("template [{$contents['template']}] - bcc group is empty");
}
if (empty($admin)) {
return $p->raiseError("template [{$contents['template']}] - bcc group is empty");
}
- $contents->bcc = $admin ;
+
+ $contents['bcc'] = $admin ;
}
if (!empty($contents['rcpts_group'])) {
}
if (!empty($contents['rcpts_group'])) {
- $admin = DB_DAtaObject::Factory('
groups
')->lookupMembers($contents['rcpts_group'],'email');
+ $admin = DB_DAtaObject::Factory('
core_group
')->lookupMembers($contents['rcpts_group'],'email');
if (empty($admin)) {
return $p->raiseError("Trying to send to {$contents['rcpts_group']} - group is empty");
if (empty($admin)) {
return $p->raiseError("Trying to send to {$contents['rcpts_group']} - group is empty");
@@
-332,15
+341,23
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
$contents['rcpts'] = $admin;
}
$contents['rcpts'] = $admin;
}
-
-
+ //subject replacement
if(empty($contents['subject'])){
$contents['subject'] = $this->subject;
}
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']);
+ var_dump($contents['subject']);
+ var_dump($pattern);
+ var_dump($replace);
+ }
+ }
if(!empty($contents['rcpts']) && is_array($contents['rcpts'])){
$contents['rcpts'] = implode(',', $contents['rcpts']);
if(!empty($contents['rcpts']) && is_array($contents['rcpts'])){
$contents['rcpts'] = implode(',', $contents['rcpts']);
- }
+ }
$ui = posix_getpwuid(posix_geteuid());
$ui = posix_getpwuid(posix_geteuid());
@@
-351,6
+368,7
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
}
require_once 'Pman/Core/Mailer.php';
}
require_once 'Pman/Core/Mailer.php';
+
$templateDir = session_save_path() . '/email-cache-' . $ui['name'] ;
//print_r($this);
$templateDir = session_save_path() . '/email-cache-' . $ui['name'] ;
//print_r($this);
@@
-363,14
+381,19
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
'contents' => $contents,
'css_embed' => true, // we should always try and do this with emails...
);
'contents' => $contents,
'css_embed' => true, // we should always try and do this with emails...
);
+
if (isset($contents['rcpts'])) {
$cfg['rcpts'] = $contents['rcpts'];
}
if (isset($contents['rcpts'])) {
$cfg['rcpts'] = $contents['rcpts'];
}
+
+ if (isset($contents['attachments'])) {
+ $cfg['attachments'] = $contents['attachments'];
+ }
+
if (isset($contents['mailer_opts']) && is_array($contents['mailer_opts'])) {
$cfg = array_merge($contents['mailer_opts'], $cfg);
}
if (isset($contents['mailer_opts']) && is_array($contents['mailer_opts'])) {
$cfg = array_merge($contents['mailer_opts'], $cfg);
}
-
$r = new Pman_Core_Mailer($cfg);
$imageCache = session_save_path() . '/email-cache-' . $ui['name'] . '/mail/' . $this->tableName() . '-' . $this->id . '-images.txt';
$r = new Pman_Core_Mailer($cfg);
$imageCache = session_save_path() . '/email-cache-' . $ui['name'] . '/mail/' . $this->tableName() . '-' . $this->id . '-images.txt';
@@
-394,6
+417,15
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
/**
*
* DEPRICATED !!! - DO NOT USE THIS !!!
/**
*
* 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)
*/
function send($obj, $force = true, $send = true)
@@
-401,11
+433,12
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
if (!$send) {
return $this->toMailerData($obj,$force);
}
if (!$send) {
return $this->toMailerData($obj,$force);
}
+
$r = $this->toMailer($obj, $force);
$r = $this->toMailer($obj, $force);
+
if (is_a($r, 'PEAR_Error')) {
return $r;
}
if (is_a($r, 'PEAR_Error')) {
return $r;
}
-
return $r->send();
}
return $r->send();
}
@@
-434,7
+467,7
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
fwrite($fh, implode("\n", array(
"From: {if:t.messageFrom}{t.messageFrom:h}{else:}{t.messageFrom():h}{end:}",
"To: {if:t.person}{t.person.getEmailFrom():h}{else:}{rcpts:h}{end:}",
fwrite($fh, implode("\n", array(
"From: {if:t.messageFrom}{t.messageFrom:h}{else:}{t.messageFrom():h}{end:}",
"To: {if:t.person}{t.person.getEmailFrom():h}{else:}{rcpts:h}{end:}",
- "Subject: {t.subject} ",
+ "Subject: {t.subject
:h
} ",
"X-Message-ID: {t.id} ",
"{if:t.replyTo}Reply-To: {t.replyTo:h}{end:}",
"{if:t.mailgunVariables}X-Mailgun-Variables: {t.mailgunVariables:h}{end:}"
"X-Message-ID: {t.id} ",
"{if:t.replyTo}Reply-To: {t.replyTo:h}{end:}",
"{if:t.mailgunVariables}X-Mailgun-Variables: {t.mailgunVariables:h}{end:}"