X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=428b30cb79a305857c4bed5900988c3860d75dca;hb=0782c2267d4722a857baab803c0e7c2c9cefc2a3;hp=e1f4e3b8438a99888fb946cab941933ecd88f8f9;hpb=a392ba666cfc6f9ca008402cdbdfdd478340c081;p=Pman.Core

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index e1f4e3b8..428b30cb 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -29,8 +29,8 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
     public $onid;                            // int(11)  not_null
     public $ontable;                         // string(128)  not_null
     public $last_event_id;                   // int(11)  
-    public $method;                         // string(128)  not_null
-    
+    public $method;                         // depricated.
+    public $method_id;                         // string(128)  not_null   
     ###END_AUTOCODE
     
     
@@ -118,6 +118,8 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
 
         $notifytimes = $this->notifyTimes(2);
+        ////print_R($notifytimes);
+        
         $newSearch = DB_DataObject::factory('core_notify');
         $newSearch->whereAdd( 'act_start > NOW()');
         $newSearch->recur_id = $this->id;
@@ -125,18 +127,20 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         // returns array('2012-12-xx'=>12, 'date' => id....)
 
         
+        
         foreach($notifytimes as $time){
-            if (strtotime($time) < time()) {
-                // will not get deleted..
-                unset($old[$time]);
-                continue;
-            }
+           
             if (isset($old[$time])) {
                 // we already have it...
                 unset($old[$time]);
                 continue;
             }
-
+            if (strtotime($time) < time()) {
+                // will not get deleted..
+                //echo "SKIP BEFORE NOW";
+                unset($old[$time]);
+               continue;
+            }
             // do not have a notify event... creat it..
             $add = DB_DataObject::factory('core_notify');
             $add->setFrom(array(
@@ -145,7 +149,8 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 "act_when" => $time,
                 "person_id" => $this->person_id,
                 "onid" => $this->onid,
-                "ontable" => $this->ontable
+                "ontable" => $this->ontable,
+                'evtype' => $this->method,
             ));
             $add->insert();
         }
@@ -154,6 +159,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 $del->get($id);
                 $del->delete();
         }
+        //echo("UPDATED");
 
     }