X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Mailer.php;h=7da09a830987298f09257b356543f7011a39a067;hp=2d18af2b46343a95229052adbfec18cad85380d1;hb=c1af5e6bb6064e88469651271f4d9aaff34d69c0;hpb=8e6ab006f36afbbb7cec0f5569cdb0461469b057

diff --git a/Mailer.php b/Mailer.php
index 2d18af2b..7da09a83 100644
--- a/Mailer.php
+++ b/Mailer.php
@@ -122,7 +122,7 @@ 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'];
         }
         
@@ -321,12 +321,8 @@ class Pman_Core_Mailer {
         
         $pg = $ff->page;
         
-        $ts = microtime(true);
-        
         $email = is_array($email)  ? $email : $this->toData();
         
-        print_r(microtime(true) - $ts);exit;
-        
         if (is_a($email, 'PEAR_Error')) {
             $pg->addEvent("COREMAILER-FAIL",  false, "email toData failed"); 
       
@@ -377,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;
@@ -404,37 +403,18 @@ class Pman_Core_Mailer {
             
             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']);
         }
         
-        /*
-        foreach ($imgs as $i=>$img) {
-            $url  = $img->getAttribute('src');
-            if (preg_match('#^cid:#', $url)) {
-                continue;
-            }
-            $me = $img->getAttribute('mailembed');
-            if ($me == 'no') {
-                continue;
-            }
-            
-            $conv = $this->fetchImage($url);
-            $this->images[$conv['contentid']] = $conv;
-            
-            $img->setAttribute('src', 'cid:' . $conv['contentid']);
-        }
-        * 
-        */
         
         return $dom->saveHTML();
         
-        
-        
     }
     function htmlbodyCssEmbed($html)
     {
@@ -527,10 +507,14 @@ class Pman_Core_Mailer {
         @$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();
     }