X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Mailer.php;h=7da09a830987298f09257b356543f7011a39a067;hb=HEAD;hp=769d55906c1abb4cef91c058066cd41edb0e4ab6;hpb=ab1dd3bed6b58524112a243addc1f33f1486ff42;p=Pman.Core diff --git a/Mailer.php b/Mailer.php index 769d5590..a79169f3 100644 --- a/Mailer.php +++ b/Mailer.php @@ -13,30 +13,37 @@ * * usage: * - * - * $x= new Pman_Core_Mailer($opts) - * - * $x= Pman_Core_Mailer(array( - page => - contents << keys must be trusted - bcc -> - template - html_locale => 'en' == always use the 'english translated verison' - cache_images => true -- defaults to caching images - set to false to disable. - replaceImages => true|false, - urlmap => array( - 'https://www.mysite.com/', 'http://localhost/' - ) - locale => 'en' .... or zh_hk.... - rcpts => array() // override recipients.. - attachments => array( - array( - file: - name : (optional) - uses basename of file - mimetype : - ), - ...... - mail_method : (SMTP or SMTPMX) + * + * require_once 'Pman/Core/Mailer.php'; + * $x= new Pman_Core_Mailer(array( + 'page' => $this, + // if bcc is property of this, then it will be used (BAD DESIGN) + '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 + // if bcc is property of contents, then it will be used (BAD DESIGN) + + // 'html_locale => 'en', // always use the 'english translated verison' + // 'cache_images => true, // -- defaults to caching images - set to false to disable. + // 'replaceImages => false, // should images be replaced. + // 'urlmap => array( // map urls from template to a different location. + // 'https://www.mysite.com/' => 'http://localhost/', + // ), + // 'locale' => 'en', // .... or zh_hk.... + + // 'attachments' => array( + // array( + // 'file' => '/path/to/file', // file location + // name => 'myfile.pdf', // (optional) - uses basename of file + // mimetype : + // ), + // + // 'mail_method' => 'SMTP', // or SMTPMX ) * @@ -58,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; @@ -66,11 +73,13 @@ 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 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'; @@ -79,7 +88,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; @@ -96,15 +107,18 @@ class Pman_Core_Mailer { } /** - * ---------------- Global Tools --------------- + * ---------------- Global Tools --------------- + * + * applies this variables to a object + * msgid + * HTTP_HOIST + * */ function toData() { - $templateFile = $this->template; $args = (array)$this->contents; - $content = clone($this->page); foreach($args as $k=>$v) { @@ -113,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...!!! @@ -132,17 +144,25 @@ class Pman_Core_Mailer { $tmp_opts = array( // 'forceCompile' => true, '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)) { @@ -152,9 +172,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; } @@ -167,19 +186,30 @@ 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; + //$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'); @@ -228,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) { @@ -256,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]).'
'); } } @@ -277,12 +311,24 @@ class Pman_Core_Mailer { $parts[2] = $mime->get(); $parts[1] = $mime->headers($parts[1]); } + + $ret = array( 'recipents' => $parts[0], 'headers' => $parts[1], '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; @@ -291,11 +337,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"); @@ -306,7 +354,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'])) { @@ -336,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) { @@ -344,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; @@ -357,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)) { @@ -367,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) @@ -427,7 +491,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) { @@ -495,7 +612,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(); @@ -525,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");