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 24325bb..8f1a787 100644 (file)
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -86,6 +86,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         if (strtotime($start) > strtotime($end)) {
             return array(); // no data..
         }
+        
         $ret = array();
         $hours = empty($this->freq_hour) ? array() : array_unique(json_decode($this->freq_hour));
         $days = empty($this->freq_day) ? array() : json_decode($this->freq_day);
@@ -115,9 +116,8 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
         foreach($usedays as $d){
             foreach($hours as $h){
-                print_r(date_default_timezone_get());exit;
                 $date = new DateTime($d. ' ' . $h, new DateTimeZone($this->tz));
-                $date->setTimezone(new DateTimeZone(ini_get('date.timezone')));
+                $date->setTimezone(new DateTimeZone(date_default_timezone_get()));
                 $ret[] = $date->format('Y-m-d H:i:s');
             }
         }
@@ -128,7 +128,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
     {
         //DB_DataObject::debugLevel(1);
         $w = DB_DataObject::factory($this->tableName());
-//        $w->id = 117;
+        $w->id = 117;
         $w->find();
         
         while($w->fetch()){
@@ -143,7 +143,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
 
         $notifytimes = $this->notifyTimes(2);
-        ////print_R($notifytimes);
+        print_R($notifytimes);exit;
         
         $newSearch = DB_DataObject::factory('core_notify');
         $newSearch->whereAdd( 'act_start > NOW()');