DataObjects/Core_notify_recur.php

[Pman.Core] / DataObjects / Core_notify_recur.php

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 54e532b..0a45daa 100644 (file)
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -117,9 +117,9 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         foreach($usedays as $d){
             foreach($hours as $h){
                 $date = new DateTime($d. ' ' . $h, new DateTimeZone($this->tz));
-                
-                if(!empty(ini_get('date.timezone'))){
-                    $date->setTimezone(new DateTimeZone(ini_get('date.timezone')));
+                $tz= ini_get('date.timezone');
+                if(!empty($tz)){
+                    $date->setTimezone(new DateTimeZone($tz));
                 }
                 
                 $ret[] = $date->format('Y-m-d H:i:s');
@@ -130,7 +130,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
     
     function generateNotifications()
     {
-        //DB_DataObject::debugLevel(1);
+        DB_DataObject::debugLevel(1);
         $w = DB_DataObject::factory($this->tableName());
         $w->find();
         
@@ -146,7 +146,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
 
         $notifytimes = $this->notifyTimes(2);
-        //print_R($notifytimes);
+        print_R($notifytimes);
         
         $newSearch = DB_DataObject::factory('core_notify');
         $newSearch->whereAdd( 'act_start > NOW()');
@@ -154,13 +154,11 @@ 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 = DB_DataObject::Factory('core_notify');
                 $oo->get($old[$time]);
                 $oc = clone($oo);
@@ -170,12 +168,11 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 unset($old[$time]);
                 continue;
             }
-            if (strtotime($time) < time()) {
-                // will not get deleted..
-                //echo "SKIP BEFORE NOW";
-                unset($old[$time]);
+            
+            if (strtotime($time) < time()) { // should not happen, just in case...
                continue;
             }
+            
             // do not have a notify event... creat it..
             $add = DB_DataObject::factory('core_notify');
             $add->setFrom(array(