DataObjects/Core_domain.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index f327edb..596ff9c 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -284,8 +284,7 @@ class Pman_Core_Mailer {
             $parts[2] = $mime->get();
             $parts[1] = $mime->headers($parts[1]);
         }
-        
-        
+         
         
         $ret = array(
             'recipents' => $parts[0],
@@ -296,8 +295,9 @@ class Pman_Core_Mailer {
         if ($this->rcpts !== false) {
             $ret['recipents'] =  $this->rcpts;
         }
-        
-        if (!empty($ret['recipents']) && is_array($ret['recipents']) && (empty($ret['headers']['To']) || !strlen(trim($ret['headers']['To'])))) {
+        // 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']);
         }
        
@@ -310,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();
@@ -325,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'])) {