X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Mailer.php;h=7da09a830987298f09257b356543f7011a39a067;hp=48f7b77a0ffe90b6057b4451979221dbe23f72c1;hb=HEAD;hpb=8c43cf679569c6ebe23181722fa0511523068bf0 diff --git a/Mailer.php b/Mailer.php index 48f7b77a..a79169f3 100644 --- a/Mailer.php +++ b/Mailer.php @@ -65,7 +65,7 @@ class Pman_Core_Mailer { var $debug = 0; var $page = false; /* usually a html_flexyframework_page */ - var $contents = false; /* object or array */ + var $contents = array(); /* object or array */ var $template = false; /* string */ var $replaceImages = false; /* boolean */ var $rcpts = false; @@ -73,6 +73,8 @@ class Pman_Core_Mailer { var $locale = false; // eg. 'en' or 'zh_HK' var $urlmap = array(); + var $htmlbody; + var $textbody; var $html_locale = false; // eg. 'en' or 'zh_HK' var $images = array(); // generated list of cid images for sending @@ -86,6 +88,8 @@ class Pman_Core_Mailer { var $bcc = false; + var $body_cls = false; + function __construct($args) { foreach($args as $k=>$v) { // a bit trusting.. @@ -103,7 +107,12 @@ class Pman_Core_Mailer { } /** - * ---------------- Global Tools --------------- + * ---------------- Global Tools --------------- + * + * applies this variables to a object + * msgid + * HTTP_HOIST + * */ function toData() @@ -118,17 +127,15 @@ class Pman_Core_Mailer { $content->msgid = empty($content->msgid ) ? md5(time() . rand()) : $content->msgid ; + // content can override this now $ff = HTML_FlexyFramework::get(); $http_host = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : 'pman.HTTP_HOST.not.set'; - if (isset($ff->Pman['HTTP_HOST'])) { + if (isset($ff->Pman['HTTP_HOST']) && $http_host != 'localhost') { $http_host = $ff->Pman['HTTP_HOST']; } - - - $content->HTTP_HOST = $http_host; - - - + if (empty($content->HTTP_HOST )) { + $content->HTTP_HOST = $http_host; + } // this should be done by having multiple template sources...!!! @@ -139,16 +146,23 @@ class Pman_Core_Mailer { 'site_prefix' => false, 'multiSource' => true, ); - if (!empty($this->templateDir)) { - $tmp_opts['templateDir'] = $this->templateDir; - } + $fopts = HTML_FlexyFramework::get()->HTML_Template_Flexy; + + //print_R($fopts);exit; if (!empty($fopts['DB_DataObject_translator'])) { $tmp_opts['DB_DataObject_translator'] = $fopts['DB_DataObject_translator']; } if (!empty($fopts['locale'])) { $tmp_opts['locale'] = $fopts['locale']; } + if (!empty($fopts['templateDir'])) { + $tmp_opts['templateDir'] = $fopts['templateDir']; + } + // override. + if (!empty($this->templateDir)) { + $tmp_opts['templateDir'] = $this->templateDir; + } // local opt's overwrite if (!empty($this->locale)) { @@ -172,6 +186,11 @@ class Pman_Core_Mailer { // for the html body, we may want to convert the attachments to images. // var_dump($htmlbody);exit; + + if(!empty($content->body_cls) && strlen($content->body_cls)){ + $htmlbody = $this->htmlbodySetClass($htmlbody, $content->body_cls); + } + if ($this->replaceImages) { $htmlbody = $this->htmlbodytoCID($htmlbody); } @@ -186,12 +205,13 @@ class Pman_Core_Mailer { } $tmp_opts['nonHTML'] = true; + //$tmp_opts['debug'] = true; - - //print_R($tmp_opts); + // print_R($tmp_opts); // $tmp_opts['force'] = true; $template = new HTML_Template_Flexy( $tmp_opts ); + $template->compile('mail/'. $templateFile.'.txt'); /* use variables from this object to ouput data. */ @@ -238,7 +258,9 @@ class Pman_Core_Mailer { unset($parts[1]['Content-Type']); } $mime->setTXTBody($parts[2]); + $this->textbody = $parts[2]; $mime->setHTMLBody($htmlbody); + // var_dump($mime);exit; foreach($this->images as $cid=>$cdata) { @@ -266,8 +288,10 @@ class Pman_Core_Mailer { if(preg_match('/text\/html/', $header['Content-Type'])){ $mime->setHTMLBody($parts[2]); $mime->setTXTBody('This message is in HTML only'); + $this->textbody = 'This message is in HTML only'; }else{ $mime->setTXTBody($parts[2]); + $this->textbody = $parts[2]; $mime->setHTMLBody('
'.htmlspecialchars($parts[2]).'
'); } } @@ -362,6 +386,12 @@ class Pman_Core_Mailer { } $oe = error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT); + if ($this->debug) { + print_r(array( + 'rcpts' => $rcpts, + 'email' => $email + )); + } $ret = $mail->send($rcpts,$email['headers'],$email['body']); error_reporting($oe); if ($ret === true) { @@ -370,7 +400,10 @@ class Pman_Core_Mailer { 'Subject: ' . @$email['headers']['Subject'] ); } else { - $pg->addEvent("COREMAILER-FAIL", false, $ret->toString()); + $pg->addEvent("COREMAILER-FAIL", false, + "Sending to : " . ( is_array($rcpts) ? implode(', ', $rcpts) : $rcpts ) . + " Error: " . $ret->toString()); + } return $ret; @@ -383,6 +416,8 @@ class Pman_Core_Mailer { @$dom->loadHTML('' .$html); $imgs= $dom->getElementsByTagName('img'); + $urls = array(); + foreach ($imgs as $i=>$img) { $url = $img->getAttribute('src'); if (preg_match('#^cid:#', $url)) { @@ -393,16 +428,19 @@ class Pman_Core_Mailer { continue; } - $conv = $this->fetchImage($url); - $this->images[$conv['contentid']] = $conv; - + if(!array_key_exists($url, $urls)){ + $conv = $this->fetchImage($url); + $urls[$url] = $conv; + $this->images[$conv['contentid']] = $conv; + } else { + $conv = $urls[$url]; + } + $img->setAttribute('origsrc', $url); $img->setAttribute('src', 'cid:' . $conv['contentid']); - - } - return $dom->saveHTML(); + return $dom->saveHTML(); } function htmlbodyCssEmbed($html) @@ -454,16 +492,14 @@ class Pman_Core_Mailer { } function htmlbodyInlineCss($html) - { - print_R($html);exit; - + { $dom = new DOMDocument(); - @$dom->loadHTML($html); + @$dom->loadHTML('' .$html); $html = $dom->getElementsByTagName('html'); $head = $dom->getElementsByTagName('head'); - $body = $dom->getElementsByTagName('head'); + $body = $dom->getElementsByTagName('body'); if(!$head->length){ $head = $dom->createElement('head'); @@ -476,6 +512,37 @@ class Pman_Core_Mailer { $s->appendChild($e); $head->item(0)->appendChild($s); + return $dom->saveHTML(); + + /* Inline + require_once 'HTML/CSS/InlineStyle.php'; + + $doc = new HTML_CSS_InlineStyle($html); + + $doc->applyStylesheet($this->css_inline); + + $html = $doc->getHTML(); + + return $html; + */ + } + + function htmlbodySetClass($html, $cls) + { + $dom = new DOMDocument(); + + @$dom->loadHTML('' .$html); + + $body = $dom->getElementsByTagName('body'); + if (!empty($body->length)) { + $body->item(0)->setAttribute('class', $cls); + } else { + $body = $dom->createElement("body"); + $body->setAttribute('class', $cls); + $dom->appendChild($body); + } + + return $dom->saveHTML(); } @@ -577,8 +644,7 @@ class Pman_Core_Mailer { function mapurl($in) { - - foreach($this->urlmap as $o=>$n) { + foreach($this->urlmap as $o=>$n) { if (strpos($in,$o) === 0) { $ret =$n . substr($in,strlen($o)); $this->log("mapURL in $in = $ret");