DataObjects/Core_enum.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 71d653d..040379c 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -21,6 +21,7 @@
        contents
        template
        html_locale => 'en' == always use the 'english translated verison'
+       cache_images => true -- defaults to caching images - set to false to disable.
        replaceImages => true|false,
        locale => 'en' .... or zh_hk....
        rcpts => array()   // override recipients..
@@ -69,11 +70,21 @@ class Pman_Core_Mailer {
     
     var $mail_method = 'SMTP';
     
+    var $cache_images = true;
+    
     function Pman_Core_Mailer($args) {
         foreach($args as $k=>$v) {
             // a bit trusting..
             $this->$k =  $v;
         }
+        // allow core mailer debug setting.
+        $ff = HTML_FlexyFramework::get();
+        
+        if (!empty($ff->Core_Mailer['debug'])) {
+            $this->debug = $ff->Core_Mailer['debug'];
+        }
+        
+        
     }
      
     /**
@@ -352,7 +363,6 @@ class Pman_Core_Mailer {
             
             
         }
-        print_R($this->images);exit;
         return $dom->saveHTML();
         
         
@@ -410,7 +420,6 @@ class Pman_Core_Mailer {
     
     function fetchImage($url)
     {
-        print_R($url);
         if($this->debug) {
             echo "FETCH : $url\n";
         }
@@ -460,7 +469,10 @@ class Pman_Core_Mailer {
         $user = $uinfo['name']; 
         
         $cache = ini_get('session.save_path')."/Pman_Core_Mailer-{$user}/" . md5($url);
-        if (file_exists($cache) and filemtime($cache) > strtotime('NOW - 1 WEEK')) {
+        if ($this->cache_images &&
+                file_exists($cache) &&
+                filemtime($cache) > strtotime('NOW - 1 WEEK')
+            ) {
             $ret =  json_decode(file_get_contents($cache), true);
             $ret['file'] = $cache . '.data';
             return $ret;