X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=771b68c2c11ff46bb847512a6ade7126a25bda55;hb=1f961d8d012844b463e6d4a9f7eec6405e3d4f8c;hp=42f521d36629a8f09ed651c2cd472d0f6d5cc01b;hpb=94933e512297fba1450039e81157428a9312010d;p=Pman.Core

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 42f521d3..771b68c2 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -77,39 +77,40 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     /**
      * Generate a notify event based on watches (matching whereAdd)
      *
-     * Usage: $core_watch->notify('mtrack_repos', 1, '1=1')
+     * Usage: $core_watch->notify('mtrack_repos', 1, false, date()
      */
-    function notify($ontable , $onid, $whereAdd = false)
+    function notify($ontable , $onid, $whereAdd = false, $when=false)
     {
         $w = DB_DataObject::factory('core_watch');
         if ($whereAdd !== false) { 
             $w->whereAdd($whereAdd  );
         }
-        $w->selectAdd();
-        $w->selectAdd('distinct(person_id) as person_id');
-        $people = $w->fetchAll('person_id');
+        //$w->selectAdd();
+        //$w->selectAdd('distinct(person_id) as person_id');
         
-        $nn = DB_DataObject::Factory('core_notify');
-        $nn->ontable = $ontable;
-        $nn->onid = $onid;
-        foreach($people as $p) {
-            if (!$p) { // no people??? bugs in watch table
+        foreach($w->fetchAll() as $w) { 
+            if (!$w->person_id) { // no people??? bugs in watch table
                 continue;
             }
-            $n = clone($nn);
-            $n->person_id = $p;
-            $nf = clone($n);
+         
+         
+         
+            $nn = DB_DataObject::Factory('core_notify');
+            $nn->ontable = $ontable;
+            $nn->onid = $onid;
+            $nn->evtype = $w->medium;
+            $nn->person_id = $w->person_id;
+            
+            $nf = clone($nn);
             $nf->whereAdd('sent < act_when');
             if ($nf->count()) {
                 // we have a item in the queue for that waiting to be sent..
                 continue;
             }
-            $n->act_start( date("Y-m-d H:i:s") );
+            $nn->act_start( date("Y-m-d H:i:s", $when !== false ? strtotime($when) : time()) );
             $n->insert();
             
-            
-        }
-         
+        }     
     }
     // static really...
     function notifyEvent($event)