X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=bdf3b76a7f1e06c82cf2b8d8209fcea25f8211c0;hb=58eba46bf3e5a5e7bf9725a10fe3f2117798213a;hp=33a1323e13dfc3523ba4220f91c2ac02c914e99e;hpb=4a7aed9ae1ceb97b81b3f1faee313873a19af580;p=Pman.Core

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 33a1323e..bdf3b76a 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -68,9 +68,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         if ($this->onid == 0) {
             return $c; // empty dataobject.
         }
-        $test = DB_DataObject::factory('crm_mailing_list_queue');
-        $test->get(1);
-        print_r($test);exit;
+        
         $c->autoJoin();
         
         if ($c->get($this->onid)) {
@@ -104,14 +102,14 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     }
     function delivered()
     {
-        return !empty($msgid);
+        return !empty($this->msgid);
     }
     
     function status() // used by commandline reporting at present..
     {
         switch($this->event_id) {
             case -1:
-                return 'DELIVERED';
+                return 'DELIVERED';   //not valid..
             case 0:
                 return 'PENDING';
             default:
@@ -144,6 +142,25 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'");
              
         }
+         if (!empty($q['query']['status'])) {
+            switch ($q['query']['status']) {
+                
+                case 'SUCCESS';
+                    $this->whereAdd("msg_id  != ''");
+                    break;
+                case 'FAILED';
+                    
+                    $this->whereAdd('msg_id  = '' AND event_id > 0  ');
+                    
+                    break;
+                case 'PENDING';
+                    $this->whereAdd('event_id = 0 OR (event_id  > 0 AND act_when > NOW() )');
+                    break;
+                case 'ALL':
+                default:
+                    break;
+            }
+        }