From b70ac3a22dd2b52530d604a5cbf48d7cb19f1bf3 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 14 Oct 2015 14:51:48 +0800 Subject: [PATCH] DataObjects/Core_notify.php --- DataObjects/Core_notify.php | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php index dc6bfcab..a68e6931 100644 --- a/DataObjects/Core_notify.php +++ b/DataObjects/Core_notify.php @@ -208,23 +208,22 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject if ($this->msgid != '') { return 1; } + // msgid is empty now.. - if ($this->event_id > 0 && strtotime($this->act_when) < time()) { + // if act_when is greater than now, then it's still pending. + if (strtotime($this->act_when) > time()) { + return 0; + } + + // event id can be filled in with a failed attempt. + + if ($this->event_id > 0) { return -1; } - return 0; // pending - - $this->whereAdd("msgid = '' AND event_id > 0 AND act_when < NOW()"); - - break; - case 'PENDING'; - $this->whereAdd('event_id = 0 OR (event_id > 0 AND act_when > NOW() )'); - break; - case 'OPENED'; - $this->whereAdd('is_open > 0'); - break; + // event id is empty, and act_when is in the past... not sent yet.. + return 0; // pending } -- 2.39.2