DataObjects/Core_email.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 80e2268..9dca76d 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -13,33 +13,37 @@
  *
  *  usage:
  *
- *
- *  $x= new Pman_Core_Mailer($opts)
- *
- *  $x= Pman_Core_Mailer(array(
+ * 
+ *  require_once 'Pman/Core/Mailer.php';
+ *  $x= new  Pman_Core_Mailer(array(
        'page' => $this,
                 // if bcc is property of this, then it will be used (BAD DESIGN)
-       'rcpts' => array(),   // override recipients..
-       //'bcc' => 'xyz@abc.com,abc@xyz.com', // string...
-       'contents'  => array(),    //  << keys must be trusted
-                                // if bcc is property of contents, then it will be used (BAD DESIGN)
-       'template' => 'your_template.html', 
-       'html_locale => 'en',              // always use the 'english translated verison'
-       'cache_images => true,           // -- defaults to caching images - set to false to disable.
-       'replaceImages => false,         // should images be replaced.
-        //'urlmap => array(             // map urls from template to a different location.
-      //      'https://www.mysite.com/' => 'http://localhost/'
-       //)
-       'locale' => 'en', // .... or zh_hk....
+       'rcpts' => array(),    
+       'template' => 'your_template',
+                // must be in templates/mail direcotry..
+                // header and plaintext verison in mail/your_template.txt
+                // if you want a html body - use  mail/your_template.body.html
        
-       'attachments' => array(
-            array(
-              'file' => '/path/to/file', // file location
-              name => 'myfile.pdf', // (optional) - uses basename of file
-              mimetype : 
-            ), 
-        
-        //'mail_method' =>  'SMTP', // or SMTPMX
+        // 'bcc' => 'xyz@abc.com,abc@xyz.com',  // string...
+        // 'contents'  => array(),              //  << keys must be trusted
+                                            // if bcc is property of contents, then it will be used (BAD DESIGN)
+           
+        // 'html_locale => 'en',                // always use the 'english translated verison'
+        // 'cache_images => true,               // -- defaults to caching images - set to false to disable.
+        // 'replaceImages => false,             // should images be replaced.
+        // 'urlmap => array(                    // map urls from template to a different location.
+        //      'https://www.mysite.com/' => 'http://localhost/',
+        // ),
+        // 'locale' => 'en',                    // .... or zh_hk....
+           
+        // 'attachments' => array(
+        //       array(
+        //        'file' => '/path/to/file',    // file location
+        //        name => 'myfile.pdf',         // (optional) - uses basename of file
+        //        mimetype : 
+        //      ), 
+        //  
+        // 'mail_method' =>  'SMTP',            // or SMTPMX
   
     )
  *
@@ -82,7 +86,7 @@ class Pman_Core_Mailer {
       
     var $bcc = false;
     
-    function Pman_Core_Mailer($args) {
+    function __construct($args) {
         foreach($args as $k=>$v) {
             // a bit trusting..
             $this->$k =  $v;
@@ -104,10 +108,8 @@ class Pman_Core_Mailer {
     
     function toData()
     {
-    
         $templateFile = $this->template;
         $args = (array)$this->contents;
-        
         $content  = clone($this->page);
         
         foreach($args as $k=>$v) {
@@ -135,6 +137,7 @@ class Pman_Core_Mailer {
         $tmp_opts = array(
            // 'forceCompile' => true,
             'site_prefix' => false,
+            'multiSource' => true,
         );
         if (!empty($this->templateDir)) {
             $tmp_opts['templateDir'] = $this->templateDir;
@@ -155,9 +158,8 @@ class Pman_Core_Mailer {
         $htmlbody = false;
         $html_tmp_opts = $tmp_opts;
         $htmltemplate = new HTML_Template_Flexy( $html_tmp_opts );
-        if (is_string($htmltemplate->resolvePath('mail/'.$templateFile.'.body.html')) ) {
+        if (is_string($htmltemplate->resolvePath('mail/'.$templateFile.'.body.html')) ) { 
             // then we have a multi-part email...
-            
             if (!empty($this->html_locale)) {
                 $html_tmp_opts['locale'] = $this->html_locale;
             }
@@ -183,8 +185,8 @@ class Pman_Core_Mailer {
         
         //print_R($tmp_opts);
         // $tmp_opts['force'] = true;
-        $template = new HTML_Template_Flexy(  $tmp_opts );
         
+        $template = new HTML_Template_Flexy(  $tmp_opts );
         $template->compile('mail/'. $templateFile.'.txt');
         
         /* use variables from this object to ouput data. */
@@ -280,12 +282,24 @@ class Pman_Core_Mailer {
             $parts[2] = $mime->get();
             $parts[1] = $mime->headers($parts[1]);
         }
+         
+        
         $ret = array(
             'recipents' => $parts[0],
             'headers' => $parts[1],
             'body' => $parts[2],
             'mailer' => $this
         );
+        if ($this->rcpts !== false) {
+            $ret['recipents'] =  $this->rcpts;
+        }
+        // if 'to' is empty, then add the recipents in there... (must be an array?
+        if (!empty($ret['recipents']) && is_array($ret['recipents']) &&
+                (empty($ret['headers']['To']) || !strlen(trim($ret['headers']['To'])))) {
+            $ret['headers']['To'] = implode(',', $ret['recipents']);
+        }
+       
+        
         // add bcc if necessary..
         if (!empty($this->bcc)) {
            $ret['bcc'] = $this->bcc;
@@ -294,11 +308,13 @@ class Pman_Core_Mailer {
     }
     function send($email = false)
     {
+                       
+        $ff = HTML_FlexyFramework::get();
         
-        $pg = HTML_FlexyFramework::get()->page;
-        
+        $pg = $ff->page;
         
         $email = is_array($email)  ? $email : $this->toData();
+        
         if (is_a($email, 'PEAR_Error')) {
             $pg->addEvent("COREMAILER-FAIL",  false, "email toData failed"); 
       
@@ -309,7 +325,9 @@ class Pman_Core_Mailer {
         //$this->log( htmlspecialchars(print_r($email,true)));
         
         ///$recipents = array($this->email);
-        $mailOptions = PEAR::getStaticProperty('Mail','options');
+//        $mailOptions = PEAR::getStaticProperty('Mail','options');
+        
+        $mailOptions = isset($ff->Mail) ? $ff->Mail : array();
         //print_R($mailOptions);exit;
         
         if ($this->mail_method == 'SMTPMX' && empty($mailOptions['mailname'])) {
@@ -498,7 +516,9 @@ class Pman_Core_Mailer {
         }
         
         require_once 'HTTP/Request.php';
-        $a = new HTTP_Request($this->mapurl($url));
+        
+        $real_url = str_replace(' ', '%20', $this->mapurl($url));
+        $a = new HTTP_Request($real_url);
         $a->sendRequest();
         $data = $a->getResponseBody();