X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Mailer.php;h=7da09a830987298f09257b356543f7011a39a067;hp=700fd179a0a7afe04435d15ec15da41a3cf58338;hb=HEAD;hpb=9737301869c29333b69581a5ee6eec5832c917fe

diff --git a/Mailer.php b/Mailer.php
index 700fd179..a79169f3 100644
--- a/Mailer.php
+++ b/Mailer.php
@@ -65,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;
@@ -73,6 +73,8 @@ 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
@@ -105,7 +107,12 @@ class Pman_Core_Mailer {
     }
      
     /**
-     * ---------------- Global Tools ---------------   
+     * ---------------- Global Tools ---------------
+     *
+     * applies this variables to a object
+     * msgid
+     * HTTP_HOIST
+     * 
      */
     
     function toData()
@@ -120,13 +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...!!!
         
@@ -137,16 +146,23 @@ class Pman_Core_Mailer {
             '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)) {
@@ -171,7 +187,7 @@ class Pman_Core_Mailer {
             // for the html body, we may want to convert the attachments to images.
 //            var_dump($htmlbody);exit;
             
-            if($content->body_cls && strlen($content->body_cls)){
+            if(!empty($content->body_cls) && strlen($content->body_cls)){
                 $htmlbody = $this->htmlbodySetClass($htmlbody, $content->body_cls);
             }
             
@@ -189,12 +205,13 @@ class Pman_Core_Mailer {
             
         }
         $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');
         
         /* use variables from this object to ouput data. */
@@ -241,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) { 
             
@@ -269,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('<PRE>'.htmlspecialchars($parts[2]).'</PRE>');
                 }
             }
@@ -365,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) { 
@@ -373,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;
@@ -386,6 +416,8 @@ class Pman_Core_Mailer {
         @$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
         $imgs= $dom->getElementsByTagName('img');
         
+        $urls = array();
+        
         foreach ($imgs as $i=>$img) {
             $url  = $img->getAttribute('src');
             if (preg_match('#^cid:#', $url)) {
@@ -396,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)
@@ -494,16 +529,19 @@ class Pman_Core_Mailer {
     
     function htmlbodySetClass($html, $cls)
     {
-        print_R('run???');exit;
         $dom = new DOMDocument();
         
         @$dom->loadHTML('<?xml encoding="UTF-8">' .$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);
+        }
         
-        $class = $dom->createAttribute('class');
-        $class->value = $cls;
-        $body->item(0)->appendChild($class);
         
         return $dom->saveHTML();
     }
@@ -606,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");