DataObjects/Core_watch.php

[Pman.Core] / DataObjects / Core_watch.php

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index e00ac72..7e4bebc 100644 (file)
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -85,6 +85,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         if ($whereAdd !== false) { 
             $w->whereAdd($whereAdd  );
         }
+        $w->ontable = $ontable;
         //$w->selectAdd();
         //$w->selectAdd('distinct(person_id) as person_id');
         
@@ -102,7 +103,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
             $nn->person_id = $w->person_id;
             
             $nf = clone($nn);
-            $nf->whereAdd('sent < act_when - INTERVAL 1 HOUR');
+            $nf->whereAdd("sent < '2000-01-01'");
             if ($nf->count()) {
                 // we have a item in the queue for that waiting to be sent..
                 continue;
@@ -110,7 +111,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
             $nn->act_start( date("Y-m-d H:i:s", $when !== false ? strtotime($when) : time()) );
             $nn->insert();
         }
-        
+          
     }
     // static really...
     /**
@@ -154,8 +155,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         
         
         $w->whereAdd('person_id != '. (int) $event->person_id);
-
-        
+ 
         $watches = $w->fetchAll();
         
         //print_R($watches);exit;
@@ -187,7 +187,8 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
             
             // does this watch already have a flag...
             $nf = clone($n);
-            $nf->whereAdd('sent < act_when');
+            $nf->whereAdd("sent ><'2000-01-01'");
+            //$nf->whereAdd('sent < act_when');
             if ($nf->count()) {
                 // we have a item in the queue for that waiting to be sent..
                 continue;