Mailer.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index b724b12..cad8d35 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -77,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';
@@ -86,7 +86,7 @@ class Pman_Core_Mailer {
       
     var $bcc = false;
     
-    function Pman_Core_Mailer($args) {
+    function __construct($args) {
         foreach($args as $k=>$v) {
             // a bit trusting..
             $this->$k =  $v;
@@ -108,10 +108,8 @@ class Pman_Core_Mailer {
     
     function toData()
     {
-    
         $templateFile = $this->template;
         $args = (array)$this->contents;
-        
         $content  = clone($this->page);
         
         foreach($args as $k=>$v) {
@@ -139,6 +137,7 @@ class Pman_Core_Mailer {
         $tmp_opts = array(
            // 'forceCompile' => true,
             'site_prefix' => false,
+            'multiSource' => true,
         );
         if (!empty($this->templateDir)) {
             $tmp_opts['templateDir'] = $this->templateDir;
@@ -159,9 +158,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;
             }
@@ -177,18 +175,23 @@ class Pman_Core_Mailer {
             if ($this->replaceImages) {
                 $htmlbody = $this->htmlbodytoCID($htmlbody);    
             }
+            
             if ($this->css_embed) {
-                $htmlbody = $this->htmlbodyCssEmbed($htmlbody);    
-              
+                $htmlbody = $this->htmlbodyCssEmbed($htmlbody);
             }
+            
+            if ($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. */
@@ -205,7 +208,6 @@ class Pman_Core_Mailer {
         
         $decoder = new Mail_mimeDecode($mailtext);
         $parts = $decoder->getSendArray();
-        print_r($parts);exit;
         if (PEAR::isError($parts)) {
             return $parts;
             //echo "PROBLEM: {$parts->message}";
@@ -311,12 +313,13 @@ class Pman_Core_Mailer {
     }
     function send($email = false)
     {
+                       
         $ff = HTML_FlexyFramework::get();
         
         $pg = $ff->page;
         
-        
         $email = is_array($email)  ? $email : $this->toData();
+        
         if (is_a($email, 'PEAR_Error')) {
             $pg->addEvent("COREMAILER-FAIL",  false, "email toData failed"); 
       
@@ -450,6 +453,52 @@ class Pman_Core_Mailer {
         
     }
     
+    function htmlbodyInlineCss($html)
+    {
+        $ff = HTML_FlexyFramework::get();
+        $dom = new DOMDocument();
+        
+        // this may raise parse errors as some html may be a component..
+        @$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
+        $links = $dom->getElementsByTagName('link');
+        $lc = array();
+        foreach ($links as $link) {  // duplicate as links is dynamic and we change it..!
+            $lc[] = $link;
+        }
+        //<link rel="stylesheet" type="text/css" href="{rootURL}/roojs1/css-mailer/mailer.css">
+        
+        foreach ($lc as $i=>$link) {
+            //var_dump($link->getAttribute('href'));
+            
+            if ($link->getAttribute('rel') != 'stylesheet') {
+                continue;
+            }
+            $url  = $link->getAttribute('href');
+            $file = $ff->rootDir . $url;
+            
+            if (!preg_match('#^(http|https)://#', $url)) {
+                $file = $ff->rootDir . $url;
+
+                if (!file_exists($file)) {
+//                    echo $file;
+                    $link->setAttribute('href', 'missing:' . $file);
+                    continue;
+                }
+            } else {
+               $file = $this->mapurl($url);  
+            }
+            
+            $par = $link->parentNode;
+            $par->removeChild($link);
+            $s = $dom->createElement('style');
+            $e = $dom->createTextNode(file_get_contents($file));
+            $s->appendChild($e);
+            $par->appendChild($s);
+            
+        }
+        return $dom->saveHTML();
+    }
+    
     
     
     function fetchImage($url)
@@ -518,7 +567,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();