DataObjects/Core_email.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 9a85edb..30de1c6 100644 (file)
--- 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(),   // override recipients..
-       'template' => 'your_template.html',
+       '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,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;
@@ -105,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) {
@@ -136,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;
@@ -156,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;
             }
@@ -174,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 && 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,12 +287,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;
@@ -295,11 +313,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"); 
       
@@ -310,7 +330,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'])) {
@@ -431,7 +453,21 @@ class Pman_Core_Mailer {
         
     }
     
-    
+    function htmlbodyInlineCss($html)
+    {
+        $dom = new DOMDocument();
+        
+        @$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
+        
+        $body = $dom->getElementsByTagName('body');
+        print_R($body);exit;
+        $s = $dom->createElement('style');
+        $e = $dom->createTextNode($this->css_inline);
+        $s->appendChild($e);
+        $body->appendChild($s);
+        
+        return $dom->saveHTML();
+    }
     
     function fetchImage($url)
     {
@@ -499,7 +535,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();