X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Mailer.php;h=7da09a830987298f09257b356543f7011a39a067;hb=c1af5e6bb6064e88469651271f4d9aaff34d69c0;hp=b3f9cd5a05d31fd8532573ca7cccc16e288f784d;hpb=38c2e012a38e80204f3dd42f6a8441e421b2d204;p=Pman.Core diff --git a/Mailer.php b/Mailer.php index b3f9cd5a..7da09a83 100644 --- a/Mailer.php +++ b/Mailer.php @@ -18,8 +18,11 @@ * $x= new Pman_Core_Mailer(array( 'page' => $this, // if bcc is property of this, then it will be used (BAD DESIGN) - 'rcpts' => array(), -- only used by the 'send' code???. - 'template' => 'your_template.html', // must be in templates/mail direcotry.. -- name without the .html or .txt + 'rcpts' => array(), + 'template' => 'your_template', + // must be in templates/mail direcotry.. + // header and plaintext verison in mail/your_template.txt + // if you want a html body - use mail/your_template.body.html // 'bcc' => 'xyz@abc.com,abc@xyz.com', // string... // 'contents' => array(), // << keys must be trusted @@ -74,7 +77,7 @@ class Pman_Core_Mailer { var $html_locale = false; // eg. 'en' or 'zh_HK' var $images = array(); // generated list of cid images for sending var $attachments = false; - var $css_inline = false; // not supported + var $css_inline = false; // put the css into the html var $css_embed = false; // put the css tags into the body. var $mail_method = 'SMTP'; @@ -83,7 +86,9 @@ class Pman_Core_Mailer { var $bcc = false; - function Pman_Core_Mailer($args) { + var $body_cls = false; + + function __construct($args) { foreach($args as $k=>$v) { // a bit trusting.. $this->$k = $v; @@ -105,10 +110,8 @@ class Pman_Core_Mailer { function toData() { - $templateFile = $this->template; $args = (array)$this->contents; - $content = clone($this->page); foreach($args as $k=>$v) { @@ -119,16 +122,12 @@ class Pman_Core_Mailer { $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; - - - // this should be done by having multiple template sources...!!! require_once 'HTML/Template/Flexy.php'; @@ -136,6 +135,7 @@ class Pman_Core_Mailer { $tmp_opts = array( // 'forceCompile' => true, 'site_prefix' => false, + 'multiSource' => true, ); if (!empty($this->templateDir)) { $tmp_opts['templateDir'] = $this->templateDir; @@ -156,9 +156,8 @@ class Pman_Core_Mailer { $htmlbody = false; $html_tmp_opts = $tmp_opts; $htmltemplate = new HTML_Template_Flexy( $html_tmp_opts ); - if (is_string($htmltemplate->resolvePath('mail/'.$templateFile.'.body.html')) ) { + if (is_string($htmltemplate->resolvePath('mail/'.$templateFile.'.body.html')) ) { // then we have a multi-part email... - if (!empty($this->html_locale)) { $html_tmp_opts['locale'] = $this->html_locale; } @@ -171,21 +170,31 @@ 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); } + if ($this->css_embed) { - $htmlbody = $this->htmlbodyCssEmbed($htmlbody); - + $htmlbody = $this->htmlbodyCssEmbed($htmlbody); } + + if ($this->css_inline && strlen($this->css_inline)) { + $htmlbody = $this->htmlbodyInlineCss($htmlbody); + } + } $tmp_opts['nonHTML'] = true; //print_R($tmp_opts); // $tmp_opts['force'] = true; - $template = new HTML_Template_Flexy( $tmp_opts ); + $template = new HTML_Template_Flexy( $tmp_opts ); $template->compile('mail/'. $templateFile.'.txt'); /* use variables from this object to ouput data. */ @@ -281,8 +290,7 @@ class Pman_Core_Mailer { $parts[2] = $mime->get(); $parts[1] = $mime->headers($parts[1]); } - - + $ret = array( 'recipents' => $parts[0], @@ -290,6 +298,16 @@ class Pman_Core_Mailer { 'body' => $parts[2], 'mailer' => $this ); + if ($this->rcpts !== false) { + $ret['recipents'] = $this->rcpts; + } + // if 'to' is empty, then add the recipents in there... (must be an array? + if (!empty($ret['recipents']) && is_array($ret['recipents']) && + (empty($ret['headers']['To']) || !strlen(trim($ret['headers']['To'])))) { + $ret['headers']['To'] = implode(',', $ret['recipents']); + } + + // add bcc if necessary.. if (!empty($this->bcc)) { $ret['bcc'] = $this->bcc; @@ -298,11 +316,13 @@ class Pman_Core_Mailer { } function send($email = false) { + + $ff = HTML_FlexyFramework::get(); - $pg = HTML_FlexyFramework::get()->page; - + $pg = $ff->page; $email = is_array($email) ? $email : $this->toData(); + if (is_a($email, 'PEAR_Error')) { $pg->addEvent("COREMAILER-FAIL", false, "email toData failed"); @@ -313,7 +333,9 @@ class Pman_Core_Mailer { //$this->log( htmlspecialchars(print_r($email,true))); ///$recipents = array($this->email); - $mailOptions = PEAR::getStaticProperty('Mail','options'); +// $mailOptions = PEAR::getStaticProperty('Mail','options'); + + $mailOptions = isset($ff->Mail) ? $ff->Mail : array(); //print_R($mailOptions);exit; if ($this->mail_method == 'SMTPMX' && empty($mailOptions['mailname'])) { @@ -351,7 +373,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; @@ -364,6 +389,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)) { @@ -374,16 +401,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) @@ -434,7 +464,60 @@ class Pman_Core_Mailer { } + function htmlbodyInlineCss($html) + { + $dom = new DOMDocument(); + + @$dom->loadHTML('' .$html); + + $html = $dom->getElementsByTagName('html'); + $head = $dom->getElementsByTagName('head'); + $body = $dom->getElementsByTagName('body'); + + if(!$head->length){ + $head = $dom->createElement('head'); + $html->item(0)->insertBefore($head, $body->item(0)); + $head = $dom->getElementsByTagName('head'); + } + + $s = $dom->createElement('style'); + $e = $dom->createTextNode($this->css_inline); + $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(); + } function fetchImage($url) { @@ -502,7 +585,9 @@ class Pman_Core_Mailer { } require_once 'HTTP/Request.php'; - $a = new HTTP_Request($this->mapurl($url)); + + $real_url = str_replace(' ', '%20', $this->mapurl($url)); + $a = new HTTP_Request($real_url); $a->sendRequest(); $data = $a->getResponseBody();