DataObjects/Core_notify_recur.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 24727e2..769d559 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -18,7 +18,8 @@
  *
  *  $x= Pman_Core_Mailer(array(
        page => 
-       contents
+       contents  << keys must be trusted
+          bcc -> 
        template
        html_locale => 'en' == always use the 'english translated verison'
        cache_images => true -- defaults to caching images - set to false to disable.
@@ -75,8 +76,7 @@ class Pman_Core_Mailer {
     var $mail_method = 'SMTP';
     
     var $cache_images = true;
-    var $no_replace_images = array();
-    
+      
     var $bcc = false;
     
     function Pman_Core_Mailer($args) {
@@ -328,6 +328,9 @@ class Pman_Core_Mailer {
         } 
         $rcpts = $this->rcpts == false ? $email['recipents'] : $this->rcpts;
         
+        
+        
+        // this makes contents untrustable...
         if (!empty($this->contents['bcc']) && is_array($this->contents['bcc'])) {
             $rcpts =array_merge(is_array($rcpts) ? $rcpts : array($rcpts), $this->contents['bcc']);
         }
@@ -443,7 +446,7 @@ class Pman_Core_Mailer {
             return array(
                     'mimetype' => $mt,
                    'ext' => $ext,
-                   'contentid' => md5($file),
+                   'contentid' => md5($file),  // mailer makes md5 cid's' -- cid with attachment-** are done by mailer.
                    'file' => $file
             );
             
@@ -535,17 +538,7 @@ class Pman_Core_Mailer {
          
         
     }
-    function is_ignore_image($url)
-    {
-        foreach($this->ignore_images as $o) {
-            if (strpos($url,$o) === 0) {
-                return true;
-            }
-        }
-        return false;
-        
-        
-    }
+ 
     
     
     function log($val)