X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Mailer.php;h=7da09a830987298f09257b356543f7011a39a067;hb=a1a3ecba68d2fedabc8203e88b40759401d7472d;hp=c704c4b2455e678a92c34bfffdd2137b7fd18d54;hpb=8100afd006b32b2f26564ef9c944dd1e6dbc28a1;p=Pman.Core diff --git a/Mailer.php b/Mailer.php index c704c4b2..7da09a83 100644 --- a/Mailer.php +++ b/Mailer.php @@ -13,29 +13,37 @@ * * usage: * - * - * $x= new Pman_Core_Mailer($opts) - * - * $x= Pman_Core_Mailer(array( - page => - contents - 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 ) * @@ -55,7 +63,7 @@ */ class Pman_Core_Mailer { - var $debug = 2; + var $debug = 0; var $page = false; /* usually a html_flexyframework_page */ var $contents = false; /* object or array */ var $template = false; /* string */ @@ -69,14 +77,18 @@ 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'; var $cache_images = true; + + 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; @@ -87,8 +99,8 @@ class Pman_Core_Mailer { if (!empty($ff->Core_Mailer['debug'])) { $this->debug = $ff->Core_Mailer['debug']; } - $this->log("URL MAP"); - $this->log($urlmap); + //$this->log("URL MAP"); + //$this->log($this->urlmap); } @@ -98,13 +110,11 @@ class Pman_Core_Mailer { function toData() { - $templateFile = $this->template; - $args = $this->contents; - + $args = (array)$this->contents; $content = clone($this->page); - foreach((array)$args as $k=>$v) { + foreach($args as $k=>$v) { $content->$k = $v; } @@ -112,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'; @@ -129,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; @@ -149,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; } @@ -164,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. */ @@ -274,25 +290,39 @@ class Pman_Core_Mailer { $parts[2] = $mime->get(); $parts[1] = $mime->headers($parts[1]); } -// echo '
';
-//        print_r('parts');
-//        print_r($parts[2]);
-//        exit;
-       // list($recipents,$headers,$body) = $parts;
-        return array(
+         
+        
+        $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;
+        }
+        return $ret;
     }
     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"); 
       
@@ -300,10 +330,12 @@ class Pman_Core_Mailer {
             return $email;
         }
         
-        $this->log( htmlspecialchars(print_r($email,true)));
+        //$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'])) {
@@ -325,6 +357,9 @@ class Pman_Core_Mailer {
         } 
         $rcpts = $this->rcpts == false ? $email['recipents'] : $this->rcpts;
         
+        
+        
+        // this makes contents untrustable...
         if (!empty($this->contents['bcc']) && is_array($this->contents['bcc'])) {
             $rcpts =array_merge(is_array($rcpts) ? $rcpts : array($rcpts), $this->contents['bcc']);
         }
@@ -338,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;
@@ -351,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)) {
@@ -361,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)
@@ -400,7 +443,7 @@ class Pman_Core_Mailer {
                 $file = $ff->rootDir . $url;
 
                 if (!file_exists($file)) {
-                    echo $file;
+//                    echo $file;
                     $link->setAttribute('href', 'missing:' . $file);
                     continue;
                 }
@@ -421,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)
     {
@@ -440,7 +536,7 @@ class Pman_Core_Mailer {
             return array(
                     'mimetype' => $mt,
                    'ext' => $ext,
-                   'contentid' => md5($file),
+                   'contentid' => md5($file),  // mailer makes md5 cid's' -- cid with attachment-** are done by mailer.
                    'file' => $file
             );
             
@@ -489,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();
         
@@ -527,18 +625,21 @@ class Pman_Core_Mailer {
                 return $ret;
             }
         }
+        $this->log("mapurl no change - $in");
         return $in;
          
         
     }
+ 
+    
     
     function log($val)
     {
-        if (!$this->debug < 1) {
+        if (!$this->debug) {
             return;
         }
         if ($this->debug < 2) {
-            echo '
' . $val. "\n";
+            echo '
' . print_r($val,true). "\n"; 
             return;
         }
         $fh = fopen('/tmp/core_mailer.log', 'a');