X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=a88c5e47f22712072beb397ec70752b0f79a5fbc;hb=786913d45279746110847849a40e1d3c877d1f68;hp=57010b35caebd51d89b01ffbc1f3f65da5925548;hpb=a99cc172305065d4d88d93bdd01c1659ea4df01c;p=Pman.Core

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 57010b35..a88c5e47 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -102,14 +102,15 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
             $nn->person_id = $w->person_id;
             
             $nf = clone($nn);
-            $nf->whereAdd('sent < act_when');
+            $nf->whereAdd("sent > '2000-01-01'");
             if ($nf->count()) {
                 // we have a item in the queue for that waiting to be sent..
                 continue;
             }
             $nn->act_start( date("Y-m-d H:i:s", $when !== false ? strtotime($when) : time()) );
             $nn->insert();
-        }     
+        }
+          
     }
     // static really...
     /**
@@ -134,7 +135,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     
     function notifyEvent($event)
     {
-        DB_DataObject::DebugLevel(1);
+        //DB_DataObject::DebugLevel(1);
         // see if there are any watches on events..
         // notify everyone flagged except the person doing it...
         // this is very basic logic... -
@@ -153,11 +154,10 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         
         
         $w->whereAdd('person_id != '. (int) $event->person_id);
-
-        
+ 
         $watches = $w->fetchAll();
         
-        print_R($watches);exit;
+        //print_R($watches);exit;
         
         $nn = DB_DataObject::Factory('core_notify');
         $nn->ontable    = $event->on_table;
@@ -165,7 +165,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         
         foreach($watches as $watch) {
             if (!$watch->person_id) { // no people??? bugs in watch table
-                $dom = explode(':',$watch->event);
+                $dom = explode(':',$watch->medium);
                 if (count($dom) != 2) {
                     continue;
                 }
@@ -186,7 +186,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;