DataObjects/Core_person_signup.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 8ded27f..8601f71 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -31,6 +31,7 @@
           mimetype : 
         ), 
         ......
+        mail_method : (SMTP or SMTPMX)
   
     )
  *
@@ -59,9 +60,14 @@ class Pman_Core_Mailer {
     var $templateDir = false;
     var $locale = false; // eg. 'en' or 'zh_HK'
     
+    
     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_embed = false; // put the css tags into the body.
+    
+    var $mail_method = 'SMTP';
     
     function Pman_Core_Mailer($args) {
         foreach($args as $k=>$v) {
@@ -138,13 +144,17 @@ class Pman_Core_Mailer {
             $htmltemplate->compile('mail/'. $templateFile.'.body.html');
             $htmlbody =  $htmltemplate->bufferedOutputObject($content);
             
+            $this->htmlbody = $htmlbody;
+            
             // for the html body, we may want to convert the attachments to images.
 //            var_dump($htmlbody);exit;
             if ($this->replaceImages) {
                 $htmlbody = $this->htmlbodytoCID($htmlbody);    
             }
-            
+            if ($this->css_embed) {
+                $htmlbody = $this->htmlbodyCssEmbed($htmlbody);    
               
+            }
         }
         $tmp_opts['nonHTML'] = true;
         
@@ -256,7 +266,8 @@ class Pman_Core_Mailer {
         return array(
             'recipents' => $parts[0],
             'headers' => $parts[1],
-            'body' => $parts[2]
+            'body' => $parts[2],
+            'mailer' => $this
         );
     }
     function send($email = false)
@@ -278,7 +289,17 @@ class Pman_Core_Mailer {
         ///$recipents = array($this->email);
         $mailOptions = PEAR::getStaticProperty('Mail','options');
         //print_R($mailOptions);exit;
-        $mail = Mail::factory("SMTP",$mailOptions);
+        
+        if ($this->mail_method == 'SMTPMX' && empty($mailOptions['mailname'])) {
+            $pg->jerr("Mail[mailname] is not set - this is required for SMTPMX");
+            
+        }
+        
+        $mail = Mail::factory($this->mail_method,$mailOptions);
+        if ($this->debug) {
+            $mail->debug = $this->debug;
+        }
+        
         $email['headers']['Date'] = date('r'); 
         if (PEAR::isError($mail)) {
             $pg->addEvent("COREMAILER-FAIL",  false, "mail factory failed"); 
@@ -300,8 +321,10 @@ class Pman_Core_Mailer {
                 'To: ' .  ( is_array($rcpts) ? implode(', ', $rcpts) : $rcpts ) .
                 'Subject: '  . @$email['headers']['Subject']
             ); 
-        }  
-       
+        }  else {
+            $pg->addEvent("COREMAILER-FAIL",  false, $ret->toString());
+        }
+        
         return $ret;
     }
     
@@ -317,6 +340,11 @@ class Pman_Core_Mailer {
             if (preg_match('#^cid:#', $url)) {
                 continue;
             }
+            $me = $img->getAttribute('mailembed');
+            if ($me == 'no') {
+                continue;
+            }
+            
             $conv = $this->fetchImage($url);
             $this->images[$conv['contentid']] = $conv;
             
@@ -329,9 +357,61 @@ class Pman_Core_Mailer {
         
         
     }
-    function fetchImage($url)
+    function htmlbodyCssEmbed($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://#', $url)) {
+                $file = $ff->rootDir . $url;
+
+                if (!file_exists($file)) {
+                    echo $file;
+                    $link->setAttribute('href', 'missing:' . $file);
+                    continue;
+                }
+            } else {
+               $file = $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)
+    {
+        if($this->debug) {
+            echo "FETCH : $url\n";
+        }
         if ($url[0] == '/') {
             $ff = HTML_FlexyFramework::get();
             $file = $ff->rootDir . $url;