NotifySend.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 2caf5fa..ace03b6 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -253,8 +253,10 @@ class Pman_Core_NotifySend extends Pman
          if (!empty($opts['send-to'])) {
             $p->email = $opts['send-to'];
         }
-        // since some of them have spaces?!?!
-        $p->email = trim($p->email);
+        if ($p) {
+            // since some of them have spaces?!?!
+            $p->email = trim($p->email);
+        }
         
         require_once 'Validate.php';
         if (!Validate::email($p->email, true)) {
@@ -306,7 +308,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;
@@ -320,7 +322,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;
@@ -384,10 +386,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']);
@@ -395,10 +394,7 @@ 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'];
                     $res = $cmailer->send($email['bcc'],
                                   $email['headers'], $email['body']);
@@ -410,7 +406,7 @@ class Pman_Core_NotifySend extends Pman
                 }
                 
                 
-                $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'];
@@ -467,8 +463,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");
-            
-            
         }