From: Alan Knowles <alan@roojs.com>
Date: Wed, 28 Sep 2011 04:49:38 +0000 (+0800)
Subject: NotifySend.php
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=9c839408e59e1a36131582033393377f5e73cfc7;p=Pman.Core

NotifySend.php
---

diff --git a/NotifySend.php b/NotifySend.php
index 12ff282a..217250bf 100644
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -134,12 +134,12 @@ class Pman_Core_NotifySend extends Pman
         
         if ($email === false || isset($email['error'])) {
             // object returned 'false' - it does not know how to send it..
-            $id = $this->addEvent('NOTIFY', $w, isset($email['error'])  ?
+            $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 ') . 
                     (isset($email['error'])  ?
@@ -207,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->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"));
         }