X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=3b174ed326d17b9daff56079c161a44f93df41ba;hb=68e6ae327dea8e6703728051158f842ac7c21f2c;hp=44a3160a320a9e49e73b0f4ef26e4e6bc24ad3d7;hpb=f95c0f6901fbe224a69d9561c0178c3161c2f459;p=Pman.Core

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 44a3160a..3b174ed3 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -77,6 +77,11 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         return false;
         
     }
+    function beforeDelete($dependants_array, $roo) {
+        if ($this->delivered()) {
+            $roo->jerr("you can not delete a record of a successfull delivery");
+        }
+    }
     
     
     function act_start($set = false)
@@ -109,7 +114,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     {
         switch($this->event_id) {
             case -1:
-                return 'DELIVERED';
+                return 'DELIVERED';   //not valid..
             case 0:
                 return 'PENDING';
             default:
@@ -130,7 +135,13 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             //DB_DAtaObject::DebugLevel(1);
             // then we can build a join..
             $d = DB_DataObject::Factory($q['ontable']);
-            $d->autoJoin();
+            $ji = $d->autoJoin();
+            //echo '<PRE>';print_R($ji);
+            // get cols
+            foreach($ji['join_names'] as $cname=>$fname) {
+                 $this->selectAdd($fname . ' as ontable_id_' . $cname );
+            }
+            
             //$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
@@ -146,15 +157,15 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             switch ($q['query']['status']) {
                 
                 case 'SUCCESS';
-                    $this->whereAdd("msgid != ''");
+                    $this->whereAdd("msgid  != ''");
                     break;
                 case 'FAILED';
-                    $this->whereAdd('event_id > 0 AND act_when <= NOW() ');
-                    $this->is_active = 0;
+                    
+                    $this->whereAdd("msgid  = '' AND event_id > 0 AND act_when < NOW()");
+                    
                     break;
                 case 'PENDING';
-                    
-                    $this->is_active = 0;
+                    $this->whereAdd('event_id = 0 OR (event_id  > 0 AND act_when > NOW() )');
                     break;
                 case 'ALL':
                 default: