DataObjects/Core_watch.php

[Pman.Core] / DataObjects / Core_watch.php

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index a88c5e4..f17c60b 100644 (file)
--- 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,7 +108,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
             $nn->person_id = $w->person_id;
             
             $nf = clone($nn);
-            $nf->whereAdd("sent > '2000-01-01'");
+            $nf->whereAdd("sent < '2000-01-01'");
             if ($nf->count()) {
                 // we have a item in the queue for that waiting to be sent..
                 continue;
@@ -124,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
 
      */
     
@@ -186,7 +192,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
             
             // does this watch already have a flag...
             $nf = clone($n);
-            $nf->whereAdd("sent > '2000-01-01'");
+            $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..