X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Mailer.php;h=7da09a830987298f09257b356543f7011a39a067;hp=99bbfac60015b24f709fd1101ee65315760e8e09;hb=a1a3ecba68d2fedabc8203e88b40759401d7472d;hpb=43b32bde11de17cf8c7b587db96a13a9cafb5508

diff --git a/Mailer.php b/Mailer.php
index 99bbfac6..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'];
         }
         
@@ -373,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;
@@ -405,10 +408,11 @@ class Pman_Core_Mailer {
             } else {
                 $conv = $urls[$url];
             }
-            
+            $img->setAttribute('origsrc', $url);
             $img->setAttribute('src', 'cid:' . $conv['contentid']);
         }
         
+        
         return $dom->saveHTML();
         
     }
@@ -503,8 +507,13 @@ class Pman_Core_Mailer {
         @$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
         
         $body = $dom->getElementsByTagName('body');
-        
-        $class = $dom->setAttribute('class', $cls);
+        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();