DataObjects/core.sql

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 685de70..8ae5336 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -140,7 +140,9 @@ class Pman_Core_Mailer {
             
             // for the html body, we may want to convert the attachments to images.
 //            var_dump($htmlbody);exit;
-            $htmlbody = $this->htmlbodytoCID($htmlbody);
+            if ($this->replaceImages) {
+                $htmlbody = $this->htmlbodytoCID($htmlbody);    
+            }
             
               
         }
@@ -312,7 +314,7 @@ class Pman_Core_Mailer {
         
         foreach ($imgs as $i=>$img) {
             $url  = $img->getAttribute('src');
-            if(substr($url, 0, 3) == 'cid'){
+            if (preg_match('#^cid:#', $url)) {
                 continue;
             }
             $conv = $this->fetchImage($url);
@@ -377,7 +379,7 @@ class Pman_Core_Mailer {
         
         $cache = ini_get('session.save_path')."/Pman_Core_Mailer-{$user}/" . md5($url);
         if (file_exists($cache) and filemtime($cache) > strtotime('NOW - 1 WEEK')) {
-            $ret =  json_decode($cache);
+            $ret =  json_decode(file_get_contents($cache), true);
             $ret['file'] = $cache . '.data';
             return $ret;
         }