X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Mailer.php;h=2b3c27469e9df75b9f3ea1deaa906da5f542ad89;hb=dff7116c31985c523f927df3e8e7cf50670ef428;hp=ff0ace845e851755bcb1958d10ebeb9dd1d20c01;hpb=e4d2ef5f664f31da58aa50563141e475e462a575;p=Pman.Core

diff --git a/Mailer.php b/Mailer.php
index ff0ace84..2b3c2746 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,12 @@ class Pman_Core_Mailer {
         @$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
         
         $body = $dom->getElementsByTagName('body');
-        if ($body->count()) {
+        if (!empty($body->length)) {
             $body->item(0)->setAttribute('class', $cls);
+        } else {
+            $body = $dom->createElement("body");
+            $body->setAttribute('class', $cls);
+            $dom->appendChild($body);
         }
         
         
@@ -609,8 +617,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");