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

diff --git a/Mailer.php b/Mailer.php
index 23fb8758..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'];
         }
         
@@ -408,10 +408,11 @@ class Pman_Core_Mailer {
             } else {
                 $conv = $urls[$url];
             }
-            
+            $img->setAttribute('origsrc', $url);
             $img->setAttribute('src', 'cid:' . $conv['contentid']);
         }
         
+        
         return $dom->saveHTML();
         
     }
@@ -616,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");