foreach ($xpath->query('//img[@src]') as $img) { // process images!
$href = $img->getAttribute('src');
- $cid = explode('#', $href);
- if(isset($cid[1])){
- $img->setAttribute('src', 'cid:' . $cid[1]);
+ $hash = explode('#', $href);
+ // we name all our cid's as attachment-*
+ // however the src url may be #image-*
+
+
+ if(!isset($hash[1])){
+ continue;
+ }
+ $cid = explode('-', $hash[1]);
+ if(!empty($cid[1])){
+ $img->setAttribute('src', 'cid:attachment-' . $cid[1]);
}
}
- $unsubscribe = false;
+ $unsubscribe = $this->unsubscribe_url();
- if(!empty($cfg)){
- $unsubscribe = $cfg ['server_baseurl'] . '/Crm/Unsubscribe/' . $this->id . '/{person.id}';
- }
-
foreach ($xpath->query('//a[@href]') as $a) {
$href = $a->getAttribute('href');
if(!empty($unsubscribe)){
$element = $doc->createElement('img');
-
+ $element->setAttribute('mailembed', 'no');
$element->setAttribute('src', $cfg ['server_baseurl'] . '/Crm/Open/' . $this->id . '/{person.id}.html');
$element->setAttribute('width', '1');
$element->setAttribute('height', '1');
return;
}
+
+ function unsubscribe_url()
+ {
+ $unsubscribe = false;
+
+ $cfg = isset(HTML_FlexyFramework::get()->Pman_Crm) ? HTML_FlexyFramework::get()->Pman_Crm : false;
+
+ if(!empty($cfg)){
+ $unsubscribe = $cfg ['server_baseurl'] . '/Crm/Unsubscribe/' . $this->id . '/{person.id}';
+ }
+
+ return $unsubscribe;
+ }
+
/**
+ * convert email with contents into a core mailer object. - ready to send..
+ * @param Object|Array $obj Object (or array) to send @see Pman_Core_Mailer
+ * + subject
+ * + rcpts || person << if person is set - then it goes to them...
+ * + replace_links
+ * + template
+ * + mailer_opts
+ * + person << who it actually goes to..
+ *
+ * @param bool $force - force re-creation of cached version of email.
*
- * Usage:
- * $this->rcpts = array('sales@roojs.com');
- * // or
- * $this->rcpts = "Tester <sales@roojs.com>";
- *
- *
- * // then send it..
- * $x = DB_DataObject::factory('core_enum');
- * $x->get('name', 'NAME OF TEMPLATE');
- * $x->send(array(
- * 'rcpts' => "Tester <sales@roojs.com>",
- * 'page' => $this
- * 'link' => 'http://......'
- );
- * // on the template use {link:h} to render the link
- *
- *
+ * @returns Pman_Core_Mailer
*/
- function send($obj, $force = true, $send = true)
- {
+
+ function toMailer($obj,$force=false)
+ {
+
$contents = (array)$obj;
- if(empty($this->id)){
+ if(empty($this->id) && !empty($contents['template'])){
$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(
+ //print_r($this);
+
+
+ $cfg = array(
'template'=> $this->tableName() . '-' . $this->id,
'templateDir' => $templateDir,
'page' => $this,
- 'rcpts' => $contents['rcpts'],
- 'contents' => $contents
- ));
+ '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['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->images = $images;
}
- $ret = $r->toData();
-
- if(!$send){
- return $ret;
+ return $r;
+ }
+ function toMailerData($obj,$force=false)
+ {
+ $r = $this->toMailer($obj, $force);
+ if (is_a($r, 'PEAR_Error')) {
+ return $r;
+ }
+ return $r->toData();
+ }
+
+ function send($obj, $force = true, $send = true)
+ {
+ if (!$send) {
+ return $this->toMailerData($obj,$force);
+ }
+ $r = $this->toMailer($obj, $force);
+ if (is_a($r, 'PEAR_Error')) {
+ return $r;
}
+
return $r->send();
}
"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");
continue;
}
- $images["attachment-$i->id"] = array(
+ $images["attachment-{$i->id}"] = array(
'file' => $i->getStoreName(),
'mimetype' => $i->mimetype,
'ext' => $y->toExt($i->mimetype),
function messageFrom()
{
if (empty($this->from_name)) {
- return $this->from_email;
+ return trim($this->from_email);
}
- return '"' . addslashes($this->from_name) . '" <' . $this->from_email. '>' ;
+ return trim('"' . addslashes($this->from_name) . '" <' . $this->from_email. '>') ;
}
function formatDate($dt, $format = 'd/M/Y')