DataObjects/Core_curr_rate.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 5763600..7ab5f95 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 */
@@ -87,7 +87,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);
         
     }
      
@@ -298,9 +299,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 +313,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'); 
@@ -426,9 +427,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;
@@ -480,6 +480,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 +491,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,17 +522,24 @@ 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;
          
         
     }
-    var $debug = 1;
+    
     function log($val)
     {
-        if (!$debug) {
+        if (!$this->debug) {
+            return;
+        }
+        if ($this->debug < 2) {
+            echo '<PRE>' . $val. "\n";
             return;
         }
         $fh = fopen('/tmp/core_mailer.log', 'a');