X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=22facfca940eae2a2856d1429cb608fe181ce2df;hb=9811ce6eadeda3ca27ecfe59174913e1f300b77f;hp=2a887522ea67dd11d65247987978885e8561fcbe;hpb=145e67cf492600852184cdd50ca1407302058a76;p=Pman.Core

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 2a887522..22facfca 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -48,12 +48,25 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         *
     /* the code above is auto generated do not remove the tag below */
     
-    
+    function applyFilters($q, $au, $roo)
+    {
+        
+        if (isset($q['query']['person_id_name']) ) {
+            $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'");
+             
+        }
+         
+        
+         
+        
+        
+    }
     function notifytimesRange($advance) {
         
         $start = date('Y-m-d H:i:s', max(strtotime("NOW"), strtotime($this->dtstart)));
         $end  = date('Y-m-d H:i:s', min(strtotime("NOW + $advance DAYS"), strtotime($this->dtend)));
         
+        return array($start, $end);
     }
     
     function method()
@@ -137,16 +150,18 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         $old = $newSearch->fetchAll('act_start', 'id');
         // returns array('2012-12-xx'=>12, 'date' => id....)
 
-        
+        print_R($notifytimes);exit;
         
         foreach($notifytimes as $time){
            
             if (isset($old[$time])) {
                 // we already have it...
                 
-                $oo = clone($old[$time]);
+                $oo = DB_DataObject::Factory('core_notify');
+                $oo->get($old[$time]);
+                $oc = clone($oo);
                 $oo->evtype = $this->method()->name;
-                $oo->update($old[$time]);
+                $oo->update($oc);
                 
                 unset($old[$time]);
                 continue;
@@ -197,4 +212,5 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         // should delete old events that have not occurred...
         $n->delete(DB_DATAOBJECT_WHEREADD_ONLY);
     }
+    
 }