DataObjects/Core_watch.php

[Pman.Core] / DataObjects / Core_watch.php

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 0cb966d..a7c9f47 100644 (file)
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -87,26 +87,27 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         }
         $w->selectAdd();
         $w->selectAdd('distinct(person_id) as person_id');
-        $people = $w->fetchAll('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 = $p;
+            
+            $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", $when !== false ? strtotime($when) : time()) );
+            $nn->act_start( date("Y-m-d H:i:s", $when !== false ? strtotime($when) : time()) );
             $n->insert();
-            
+                
             
         }