DataObjects/Core_domain.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index ab93b6b..5da3567 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -210,14 +210,19 @@ class Pman_Core_NotifySend extends Pman
                      "Notification event cleared (not required any more)" 
                     ."\n");
         }
-     
-        if (empty($p) && !empty($email['rcpts'])) {
+        if (is_a($email, 'PEAR_Error')) {
+            $email =array(
+                'error' => $email->toString()
+            );
+        }
+        
+        if (empty($p) && !empty($email['recipients'])) {
             // make a fake person..
             $p = (object) array(
-                'email' => $email['rcpts']
+                'email' => $email['recipients']
             );
         }
-        
+         
         if ($email === false || isset($email['error']) || empty($p)) {
             // object returned 'false' - it does not know how to send it..
             $ev = $this->addEvent('NOTIFY', $w, isset($email['error'])  ?
@@ -264,8 +269,8 @@ class Pman_Core_NotifySend extends Pman
         }
         
             // since some of them have spaces?!?!
-            $p->email = trim($p->email);
-        }
+        $p->email = trim($p->email);
+      
         
         require_once 'Validate.php';
         if (!Validate::email($p->email, true)) {
@@ -351,17 +356,15 @@ class Pman_Core_NotifySend extends Pman
         $fail = false;
         require_once 'Mail.php';
         
-        foreach($mxs as $dom) {
-            
-            
+        foreach($mxs as $mx) {
             
             if (!isset($ff->Mail['helo'])) {
                 $this->errorHandler("config Mail[helo] is not set");
             }
             $this->debug_str = '';
-            $this->debug("Trying SMTP: $dom / HELO {$ff->Mail['helo']}");
+            $this->debug("Trying SMTP: $mx / HELO {$ff->Mail['helo']}");
             $mailer = Mail::factory('smtp', array(
-                    'host'    => $dom ,
+                    'host'    => $mx ,
                     'localhost' => $ff->Mail['helo'],
                     'timeout' => 15,
                     'socket_options' =>  isset($ff->Mail['socket_options']) ? $ff->Mail['socket_options'] : null,
@@ -372,10 +375,30 @@ class Pman_Core_NotifySend extends Pman
             
             // if the host is the mail host + it's authenticated add auth details
             // this normally will happen if you sent  Pman_Core_NotifySend['host']
-            if (isset($ff->Mail['host']) && $ff->Mail['host'] == $dom && !empty($ff->Mail['auth'] )) {
+            if (isset($ff->Mail['host']) && $ff->Mail['host'] == $mx && !empty($ff->Mail['auth'] )) {
+                
+                $username = $ff->Mail['username'] ;
+                $password = $ff->Mail['password'] ;
+                
+                if(!empty($ff->Core_Notify)){
+                    
+                    foreach ($ff->Core_Notify['routes'] as $server => $settings){
+                        if(!in_array($dom, $settings['domains'])){
+                            continue;
+                        }
+                        
+                        $mailer->host = $server;
+                        $username = $settings['username'];
+                        $password = $settings['password'];
+                        
+                        break;
+                    }
+                    
+                }
+                
                 $mailer->auth = true;
-                $mailer->username = $ff->Mail['username'] ;
-                $mailer->password = $ff->Mail['password'] ;        
+                $mailer->username = $username;
+                $mailer->password = $password;        
             }
             
             $res = $mailer->send($p->email, $email['headers'], $email['body']);