DataObjects/Core_event_audit.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 472a120..217250b 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -119,7 +119,7 @@ class Pman_Core_NotifySend extends Pman
         // find last event..
         $ev = DB_DataObject::factory('Events');
         $ev->on_id = $w->id;                           // int(11)
-        $ev->od_table = $this->table;
+        $ev->on_table = $this->table;
         $ev->limit(1);
         $ev->orderBy('event_when DESC');
         $ar = $ev->fetchAll('event_when');
@@ -132,18 +132,19 @@ class Pman_Core_NotifySend extends Pman
         
         $email =  $this->makeEmail($o, $p, $last, $w);
         
-        if ($email === false) {
+        if ($email === false || isset($email['error'])) {
             // object returned 'false' - it does not know how to send it..
-            $id = $this->addEvent('NOTIFY', $w, "INTERNAL ERROR - ".
-                        $p->email . ' ' .
-                         " - We can not handle "));
+            $ev = $this->addEvent('NOTIFY', $w, isset($email['error'])  ?
+                            $email['error'] : "INTERNAL ERROR  - We can not handle " . $w->ontable);;
+            $ww = clone($w);
             $w->sent = date('Y-m-d H:i:s');
             $w->msgid = '';
-            $w->event_id = $id;
+            $w->event_id = $ev->id;
             $w->update($ww);
-            die(date('Y-m-d h:i:s') . ' - FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED\n"));
-            
-            
+            die(date('Y-m-d h:i:s ') . 
+                    (isset($email['error'])  ?
+                            $email['error'] : "INTERNAL ERROR  - We can not handle " . $w->ontable)
+                    ."\n");
         }
         
         
@@ -188,7 +189,7 @@ class Pman_Core_NotifySend extends Pman
                 die(date('Y-m-d h:i:s') . " - SENT\n");
             }
             // what type of error..
-            $code = empty($res->smtpcode) ? -1 : $res->smtpcode;
+            $code = empty($res->userinfo['smtpcode']) ? -1 : $res->userinfo['smtpcode'];
             if ($code < 0) {
                 continue; // try next mx... ??? should we wait??? - nope we did not even connect..
             }
@@ -206,12 +207,12 @@ class Pman_Core_NotifySend extends Pman
         }
         if ($fail || $next_try_min > (2*24*60)) {
         // fail.. = log and give up..
-            $id = $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ".
+            $ev = $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ".
                         $p->email . ' ' .
-                        ($fail ? ($res->smtpcode . ' : ' .$res->toString()) :  " - UNKNOWN ERROR"));
+                        ($fail ? ($res->userinfo['smtpcode'] . ' : ' .$res->toString()) :  " - UNKNOWN ERROR"));
             $w->sent = date('Y-m-d H:i:s');
             $w->msgid = '';
-            $w->event_id = $id;
+            $w->event_id = $ev->id;
             $w->update($ww);
             die(date('Y-m-d h:i:s') . ' - FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED\n"));
         }