X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=f17c60b366249399c1e0c10ecdb171fdc002becf;hb=4f0370e9d80f4c3680fd2c42729e57f97024489d;hp=5c77b3d984d530748ec899c03609b30f87ddc867;hpb=bc883ebef5f85e7f9e5f02b8b3b9fbeb9d6fd854;p=Pman.Core

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 5c77b3d9..f17c60b3 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -85,6 +85,12 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         if ($whereAdd !== false) { 
             $w->whereAdd($whereAdd  );
         }
+        $w->active =1;
+        
+         $w->whereAdd('onid = 0 OR onid='. ((int) $onid));
+       
+        
+        $w->ontable = $ontable;
         //$w->selectAdd();
         //$w->selectAdd('distinct(person_id) as person_id');
         
@@ -102,14 +108,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...
     /**
@@ -123,12 +130,12 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
      *  = eg. mtrack_ticket * watch will notify mtrack_jira::
      *
      *  in that example:
-     *     ublic $ontable;                         // string(128)  not_null
-    public $onid;                            // int(11)  not_null
-    public $person_id;                       // int(11)  not_null
-    public $event;                           // string(128)  not_null
-    public $medium;                          // string(128)  not_null
-    public $active;                          // int(11)  not_null
+     *     public $ontable;                         // string(128)  not_null
+            public $onid;                            // int(11)  not_null
+            public $person_id;                       // int(11)  not_null
+            public $event;                           // string(128)  not_null
+            public $medium;                          // string(128)  not_null
+            public $active;                          // int(11)  not_null
 
      */
     
@@ -153,11 +160,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 +171,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 +192,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;