X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Mailer.php;h=7da09a830987298f09257b356543f7011a39a067;hp=77d5d4c7a00c2fb58032c34a8b961ce0c9c9faba;hb=a1a3ecba68d2fedabc8203e88b40759401d7472d;hpb=0b1641aa8c30950d790631ebd394d22e42c7ef61

diff --git a/Mailer.php b/Mailer.php
index 77d5d4c7..7da09a83 100644
--- a/Mailer.php
+++ b/Mailer.php
@@ -86,6 +86,8 @@ class Pman_Core_Mailer {
       
     var $bcc = false;
     
+    var $body_cls = false;
+    
     function __construct($args) {
         foreach($args as $k=>$v) {
             // a bit trusting..
@@ -120,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';
@@ -172,6 +170,11 @@ 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);    
             }
@@ -370,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;
@@ -383,6 +389,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)) {
@@ -393,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)
@@ -454,53 +465,58 @@ class Pman_Core_Mailer {
     }
     
     function htmlbodyInlineCss($html)
-    {
+    {   
+        $dom = new DOMDocument();
+        
+        @$dom->loadHTML('<?xml encoding="UTF-8">' .$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 = $htmldoc->getHTML();
-        
-//        libxml_use_internal_errors (false);
-//        
-//        if (!function_exists('tidy_repair_string')) {
-//            return "INSTALL TIDY ON SERVER " . $html;
-//        }
-//        
-//        $html = tidy_repair_string(
-//                $html,
-//                array(
-//                  'indent' => TRUE,
-//                    'output-xhtml' => TRUE,
-//                    'wrap' => 120
-//                ),
-//                'UTF8'
-//        );
+        $html = $doc->getHTML();
         
         return $html;
+        */
+    }
+    
+    function htmlbodySetClass($html, $cls)
+    {
+        $dom = new DOMDocument();
+        
+        @$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
         
-//        $dom = new DOMDocument();
-//        
-//        @$dom->loadHTML('<?xml encoding="UTF-8">' .$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();
+        $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)