X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=0e80c6de33b4244ca8f19af08dadcb7fd79863f8;hb=a79147a031923e2ffa60aee669faa64386dd2336;hp=3a571d657f93ee8b7f57a93ed02c23f7f8e024ab;hpb=ea32df687c38686ea7634ea4c15d32548f56f3a9;p=Pman.Core

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 3a571d65..0e80c6de 100644
--- 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..
@@ -125,21 +127,37 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         if (isset($q['ontable']) && !in_array($q['ontable'], array('Person', 'Events' . 'core_watch'))) {
             // this will only work on tables not joined to ours.
             
-            
+            //DB_DAtaObject::DebugLevel(1);
             // then we can build a join..
             $d = DB_DataObject::Factory($q['ontable']);
             $d->autoJoin();
-            $this->selectAdd($d->data_select);
-            
-            $this->_join .= $d->join; 
-            echo '<PRE>';print_R($d);
-            exit;
-            
-            
-            
-            
-            
-            
+            //$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->is_active = 1;
+                    break;
+                case 'FAILED';
+                    $this->is_active = 0;
+                    break;
+                case 'PENDING';  
+                    $this->is_active = 0;
+                    break;
+                case 'ALL':
+                default:
+                    break;
+            }
         }