DataObjects/Core_notify_recur.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index feb8876..e8903a8 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -55,7 +55,7 @@
  */
 
 class Pman_Core_Mailer {
-    var $debug          = false;
+    var $debug          = 0;
     var $page           = false; /* usually a html_flexyframework_page */
     var $contents       = false; /* object or array */
     var $template       = false; /* string */
@@ -75,6 +75,8 @@ class Pman_Core_Mailer {
     var $mail_method = 'SMTP';
     
     var $cache_images = true;
+      
+    var $bcc = false;
     
     function Pman_Core_Mailer($args) {
         foreach($args as $k=>$v) {
@@ -87,7 +89,8 @@ class Pman_Core_Mailer {
         if (!empty($ff->Core_Mailer['debug'])) {
             $this->debug = $ff->Core_Mailer['debug'];
         }
-        
+        //$this->log("URL MAP");
+        //$this->log($this->urlmap);
         
     }
      
@@ -99,11 +102,11 @@ class Pman_Core_Mailer {
     {
     
         $templateFile = $this->template;
-        $args = $this->contents;
+        $args = (array)$this->contents;
         
         $content  = clone($this->page);
         
-        foreach((array)$args as $k=>$v) {
+        foreach($args as $k=>$v) {
             $content->$k = $v;
         }
         
@@ -273,17 +276,17 @@ class Pman_Core_Mailer {
             $parts[2] = $mime->get();
             $parts[1] = $mime->headers($parts[1]);
         }
-//        echo '<PRE>';
-//        print_r('parts');
-//        print_r($parts[2]);
-//        exit;
-       // list($recipents,$headers,$body) = $parts;
-        return array(
+        $ret = array(
             'recipents' => $parts[0],
             'headers' => $parts[1],
             'body' => $parts[2],
             'mailer' => $this
         );
+        // add bcc if necessary..
+        if (!empty($this->bcc)) {
+           $ret['bcc'] = $this->bcc;
+        }
+        return $ret;
     }
     function send($email = false)
     {
@@ -298,9 +301,9 @@ class Pman_Core_Mailer {
             
             return $email;
         }
-        if ($this->debug) {
-            echo '<PRE>';echo htmlspecialchars(print_r($email,true));
-        }
+        
+        //$this->log( htmlspecialchars(print_r($email,true)));
+        
         ///$recipents = array($this->email);
         $mailOptions = PEAR::getStaticProperty('Mail','options');
         //print_R($mailOptions);exit;
@@ -312,7 +315,7 @@ class Pman_Core_Mailer {
         
         $mail = Mail::factory($this->mail_method,$mailOptions);
         if ($this->debug) {
-            $mail->debug = $this->debug;
+            $mail->debug = (bool) $this->debug;
         }
         
         $email['headers']['Date'] = date('r'); 
@@ -399,12 +402,12 @@ class Pman_Core_Mailer {
                 $file = $ff->rootDir . $url;
 
                 if (!file_exists($file)) {
-                    echo $file;
+//                    echo $file;
                     $link->setAttribute('href', 'missing:' . $file);
                     continue;
                 }
             } else {
-               $file = $url;  
+               $file = $this->mapurl($url);  
             }
             
             $par = $link->parentNode;
@@ -426,9 +429,8 @@ class Pman_Core_Mailer {
     {
         
         
-        if($this->debug) {
-            echo "FETCH : $url\n";
-        }
+        $this->log( "FETCH : $url\n");
+        
         if ($url[0] == '/') {
             $ff = HTML_FlexyFramework::get();
             $file = $ff->rootDir . $url;
@@ -440,7 +442,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
             );
             
@@ -480,6 +482,7 @@ class Pman_Core_Mailer {
                 filemtime($cache) > strtotime('NOW - 1 WEEK')
             ) {
             $ret =  json_decode(file_get_contents($cache), true);
+            $this->log("fetched from cache");
             $ret['file'] = $cache . '.data';
             return $ret;
         }
@@ -490,7 +493,13 @@ class Pman_Core_Mailer {
         require_once 'HTTP/Request.php';
         $a = new HTTP_Request($this->mapurl($url));
         $a->sendRequest();
-        file_put_contents($cache .'.data', $a->getResponseBody());
+        $data = $a->getResponseBody();
+        
+        $this->log("got file of size " . strlen($data));
+        $this->log("save contentid " . md5($url));
+        
+        file_put_contents($cache .'.data', $data);
+        
         
         $mt = $a->getResponseHeader('Content-Type');
         
@@ -515,13 +524,33 @@ class Pman_Core_Mailer {
         
         foreach($this->urlmap as $o=>$n) {
             if (strpos($in,$o) === 0) {
-                return $n . substr($in,strlen($o));
+                $ret =$n . substr($in,strlen($o));
+                $this->log("mapURL in $in = $ret");
+                return $ret;
             }
         }
+        $this->log("mapurl no change - $in");
         return $in;
          
         
     }
+ 
+    
     
+    function log($val)
+    {
+        if (!$this->debug) {
+            return;
+        }
+        if ($this->debug < 2) {
+            echo '<PRE>' . print_r($val,true). "\n"; 
+            return;
+        }
+        $fh = fopen('/tmp/core_mailer.log', 'a');
+        fwrite($fh, date('Y-m-d H:i:s -') . json_encode($val) . "\n");
+        fclose($fh);
+        
+        
+    }
     
 }
\ No newline at end of file