DataObjects/Core_notify.php

[Pman.Core] / DataObjects / Core_notify.php

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 0417d32..c6e8f5e 100644 (file)
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -64,11 +64,13 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             return $set;
         }
         $c = DB_DataObject::factory($this->ontable);
+        
         if ($this->onid == 0) {
             return $c; // empty dataobject.
         }
         
         $c->autoJoin();
+        
         if ($c->get($this->onid)) {
             return $c;
         }
@@ -100,7 +102,7 @@ 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..
@@ -129,17 +131,35 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             // then we can build a join..
             $d = DB_DataObject::Factory($q['ontable']);
             $d->autoJoin();
-            $this->selectAdd($d->_query['data_select']);
+            //$this->selectAdd($d->_query['data_select']); -- this will cause the same dataIndex...
             $this->_join .= "
                 LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id
                 {$d->_join}
             "; 
-            
+            $this->selectAs($d, 'core_notify_%s');
         } 
         if (isset($q['query']['person_id_name']) ) {
             $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("event_id < 0");
+                    break;
+                case 'FAILED';
+                    $this->whereAdd('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 'ALL':
+                default:
+                    break;
+            }
+        }