DataObjects/Core_domain.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 17e8149..596ff9c 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -18,8 +18,11 @@
  *  $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..
-       'template' => 'your_template.html',  // must be in templates/mail direcotry..
+       '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
        
         // 'bcc' => 'xyz@abc.com,abc@xyz.com',  // string...
         // 'contents'  => array(),              //  << keys must be trusted
@@ -281,12 +284,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;
@@ -295,8 +310,9 @@ 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();
@@ -310,7 +326,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'])) {