DataObjects/I18n.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 35c832f..8ded27f 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -16,10 +16,11 @@
  *
  *  $x= new Pman_Core_Mailer($opts)
  *
- *  $opts[
+ *  $x= Pman_Core_Mailer(array(
        page => 
        contents
        template
+       html_locale => 'en' == always use the 'english translated verison'
        replaceImages => true|false,
        locale => 'en' .... or zh_hk....
        rcpts => array()   // override recipients..
@@ -31,7 +32,7 @@
         ), 
         ......
   
-    ]
+    )
  *
  *  recipents is gathered from the resulting template
  *   -- eg.
@@ -41,7 +42,7 @@
  *  if the file     '
  * 
  * 
- *  $x->asData(); // returns data needed for notify?? - notify should really
+ *  $x->toData(); // returns data needed for notify?? - notify should really
  *                  // just use this to pass around later..
  *
  *  $x->send();
@@ -139,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);    
+            }
             
               
         }
@@ -256,13 +259,13 @@ class Pman_Core_Mailer {
             'body' => $parts[2]
         );
     }
-    function send()
+    function send($email = false)
     {
         
         $pg = HTML_FlexyFramework::get()->page;
         
         
-        $email = $this->toData();
+        $email = is_array($email)  ? $email : $this->toData();
         if (is_a($email, 'PEAR_Error')) {
             $pg->addEvent("COREMAILER-FAIL",  false, "email toData failed"); 
       
@@ -276,9 +279,9 @@ class Pman_Core_Mailer {
         $mailOptions = PEAR::getStaticProperty('Mail','options');
         //print_R($mailOptions);exit;
         $mail = Mail::factory("SMTP",$mailOptions);
-        $headers['Date'] = date('r'); 
+        $email['headers']['Date'] = date('r'); 
         if (PEAR::isError($mail)) {
-             $pg->addEvent("COREMAILER-FAIL",  false, "mail factory failed"); 
+            $pg->addEvent("COREMAILER-FAIL",  false, "mail factory failed"); 
       
             
             return $mail;
@@ -294,8 +297,8 @@ class Pman_Core_Mailer {
         error_reporting($oe);
         if ($ret === true) { 
             $pg->addEvent("COREMAILER-SENT",  false,
-                    'To: ' . implode(', ', $rcpts) .
-                    'Subject '  . $headers['subject']
+                'To: ' .  ( is_array($rcpts) ? implode(', ', $rcpts) : $rcpts ) .
+                'Subject: '  . @$email['headers']['Subject']
             ); 
         }  
        
@@ -311,6 +314,9 @@ class Pman_Core_Mailer {
         
         foreach ($imgs as $i=>$img) {
             $url  = $img->getAttribute('src');
+            if (preg_match('#^cid:#', $url)) {
+                continue;
+            }
             $conv = $this->fetchImage($url);
             $this->images[$conv['contentid']] = $conv;
             
@@ -373,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;
         }