DataObjects/Core_domain.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index f1931d3..5da3567 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -210,10 +210,20 @@ class Pman_Core_NotifySend extends Pman
                      "Notification event cleared (not required any more)" 
                     ."\n");
         }
-     
-       
+        if (is_a($email, 'PEAR_Error')) {
+            $email =array(
+                'error' => $email->toString()
+            );
+        }
         
-        if ($email === false || isset($email['error'])) {
+        if (empty($p) && !empty($email['recipients'])) {
+            // make a fake person..
+            $p = (object) array(
+                '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'])  ?
                             $email['error'] : "INTERNAL ERROR  - We can not handle " . $w->ontable); 
@@ -231,10 +241,9 @@ class Pman_Core_NotifySend extends Pman
         
         if (isset($email['later'])) {
             $old = clone($w);
-            
             $w->act_when = $email['later'];
             $w->update($old);
-            $this->errorHandler(date('Y-m-d h:i:s ') . " Delivery postponed by email creator");
+            $this->errorHandler(date('Y-m-d h:i:s ') . " Delivery postponed by email creator to {$email['later']}");
         }
         
          
@@ -243,6 +252,10 @@ class Pman_Core_NotifySend extends Pman
             $email['headers']['Message-Id'] = "<{$this->table}-{$id}@{$HOST}>";
             
         }
+        
+        
+            
+        
         //$p->email = 'alan@akbkhome.com'; //for testing..
         //print_r($email);exit;
         // should we fetch the watch that caused it.. - which should contain the method to call..
@@ -254,8 +267,10 @@ class Pman_Core_NotifySend extends Pman
          if (!empty($opts['send-to'])) {
             $p->email = $opts['send-to'];
         }
-        // since some of them have spaces?!?!
+        
+            // since some of them have spaces?!?!
         $p->email = trim($p->email);
+      
         
         require_once 'Validate.php';
         if (!Validate::email($p->email, true)) {
@@ -307,7 +322,7 @@ class Pman_Core_NotifySend extends Pman
                 $this->errorHandler(date('Y-m-d h:i:s') . " - MX LOOKUP FAILED\n");
             }
             
-            $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - ". $p->email );
+            $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - BAD DOMAIN - ". $p->email );
             $w->sent = date('Y-m-d H:i:s');
             $w->msgid = '';
             $w->event_id = $ev->id;
@@ -321,7 +336,7 @@ class Pman_Core_NotifySend extends Pman
         
         
         if (!$force && strtotime($w->act_start) <  strtotime('NOW - 14 DAY')) {
-            $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - ". $p->email );
+            $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - GIVE UP - ". $p->email );
             $w->sent = date('Y-m-d H:i:s');
             $w->msgid = '';
             $w->event_id = $ev->id;
@@ -341,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,
@@ -362,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']);
@@ -385,10 +418,7 @@ class Pman_Core_NotifySend extends Pman
                 
                 // enable cc in notify..
                 if (!empty($email['headers']['Cc'])) {
-                    $cmailer = Mail::factory('smtp', array(
-                       //'host'    => $dom ,
-                      //  'debug' => true
-                    ));
+                    $cmailer = Mail::factory('smtp',  isset($ff->Mail) ? $ff->Mail : array() );
                     $email['headers']['Subject'] = "(CC): " . $email['headers']['Subject'];
                     $cmailer->send($email['headers']['Cc'],
                                   $email['headers'], $email['body']);
@@ -396,18 +426,19 @@ class Pman_Core_NotifySend extends Pman
                 }
                 
                 if (!empty($email['bcc'])) {
-                    $cmailer = Mail::factory('smtp', array(
-                       //'host'    => $dom ,
-                      //  'debug' => true
-                    ));
+                    $cmailer = Mail::factory('smtp', isset($ff->Mail) ? $ff->Mail : array() );
                     $email['headers']['Subject'] = "(CC): " . $email['headers']['Subject'];
-                    $cmailer->send($email['bcc'],
+                    $res = $cmailer->send($email['bcc'],
                                   $email['headers'], $email['body']);
-                    
+                    if (!$res || is_a($res, 'PEAR_Error')) {
+                        echo "could not send bcc..\n";
+                    } else {
+                        echo "Sent BCC to {$email['bcc']}\n";
+                    }
                 }
                 
                 
-                $this->errorHandler(date('Y-m-d h:i:s') . " - SENT\n");
+                $this->errorHandler(date('Y-m-d h:i:s') . " - SENT {$w->id} - {$w->to_email} \n");
             }
             // what type of error..
             $code = empty($res->userinfo['smtpcode']) ? -1 : $res->userinfo['smtpcode'];
@@ -464,8 +495,6 @@ class Pman_Core_NotifySend extends Pman
             $w->event_id = $ev->id;
             $w->update($ww);
             $this->errorHandler(date('Y-m-d h:i:s') . " - FAILED - RETRY TIME EXCEEDED\n");
-            
-            
         }