function send($obj, $force = true, $send = true)
{
$contents = (array)$obj;
-
+
if(empty($this->id)){
$this->get('name', $contents['template']);
}
if(empty($this->id)){
$p = new PEAR();
- return $p->raiseError("template [{$contents['template']}]has not been set");
+ return $p->raiseError("template [{$contents['template']}] has not been set");
}
if(empty($contents['subject'])){
$contents['subject'] = $this->subject;
require_once 'Pman/Core/Mailer.php';
$templateDir = session_save_path() . '/email-cache-' . $ui['name'] ;
+ //print_r($this);
+
- $r = new Pman_Core_Mailer(array(
+ $cfg = array(
'template'=> $this->tableName() . '-' . $this->id,
'templateDir' => $templateDir,
'page' => $this,
'contents' => $contents
- ));
+ );
+ if (isset($contents['rcpts'])) {
+ $cfg['rcpts'] = $contents['rcpts'];
+ }
+
+ $r = new Pman_Core_Mailer($cfg);
$imageCache = session_save_path() . '/email-cache-' . $ui['name'] . '/mail/' . $this->tableName() . '-' . $this->id . '-images.txt';
"To: {if:t.person}{t.person.getEmailFrom():h}{else:}{rcpts:h}{end:}",
"Subject: {t.subject} ",
"X-Message-ID: {t.id} ",
- "{if:t.replyTo}Reply-To: {t.replyTo:h}{end:}"
+ "{if:t.replyTo}Reply-To: {t.replyTo:h}{end:}",
+ "{if:t.mailgunVariables}X-Mailgun-Variables: {t.mailgunVariables:h}{end:}"
))."\n");
function messageFrom()
{
- return '"' . addslashes($this->from_name) . '" <' . $this->from_email. '>' ;
+ if (empty($this->from_name)) {
+ return trim($this->from_email);
+ }
+ return trim('"' . addslashes($this->from_name) . '" <' . $this->from_email. '>') ;
}
function formatDate($dt, $format = 'd/M/Y')