X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=abcc32a5c0ef926d54ce52041afe7288398c5db7;hb=6c57ccba338a7c65b22031fd4c705f4d3ec4b159;hp=44fc8ff75dfea6e6fee5c29a1df5343c7856a508;hpb=da1071ae8ccb349de19f98f436e4c20793d491bc;p=Pman.Core

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 44fc8ff7..abcc32a5 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -65,7 +65,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         }
         $ret = array();
         $hours = empty($this->freq_hour) ? array() : array_unique(json_decode($this->freq_hour));
-        $days = json_decode($this->freq_day);
+        $days = empty($this->freq_day) ? array() : json_decode($this->freq_day);
         
         //days to use are = MON FRI SUN
         
@@ -81,13 +81,13 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         $usedays = array();
         for (  $i =0; $i < $advance +1; $i++) {
             $ut = strtotime("NOW + $i DAYS");
-            $day = date("???", $ut);
+            $day = strtoupper(date("D", $ut));
             if (in_array($day, $days)) {
                 $usedays[] = date("Y-m-d", $ut);
             }
         }
                 
-        
+        //print_r($this);
         
         
         foreach($usedays as $d){
@@ -118,15 +118,19 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
 
         $notifytimes = $this->notifyTimes(2);
+        print_R($notifytimes);exit;
+        
         $newSearch = DB_DataObject::factory('core_notify');
         $newSearch->whereAdd( 'act_start > NOW()');
         $newSearch->recur_id = $this->id;
         $old = $newSearch->fetchAll('act_start', 'id');
         // 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])) {
@@ -143,7 +147,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();
         }