X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=54bf926e427ce77e9a46b4bf86e834596bec5699;hb=19cef84970b11a6a8af8abe00fbbdaed9e0a9ca2;hp=2524a2afec4acdcd6d7476afb88f33f758ff518a;hpb=11559a3209b395ec838338c61253c1c067259db8;p=Pman.Core

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 2524a2af..54bf926e 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -66,6 +66,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         $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()
@@ -109,14 +110,18 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 $usedays[] = date("Y-m-d", $ut);
             }
         }
-                
+               
         //print_r($this);
         
         
         foreach($usedays as $d){
             foreach($hours as $h){
                 $date = new DateTime($d. ' ' . $h, new DateTimeZone($this->tz));
-                $date->setTimezone(new DateTimeZone(date_default_timezone_get()));
+                $tz= ini_get('date.timezone');
+                if(!empty($tz)){
+                    $date->setTimezone(new DateTimeZone($tz));
+                }
+                
                 $ret[] = $date->format('Y-m-d H:i:s');
             }
         }
@@ -127,7 +132,6 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
     {
         //DB_DataObject::debugLevel(1);
         $w = DB_DataObject::factory($this->tableName());
-        $w->id = 117;
         $w->find();
         
         while($w->fetch()){
@@ -151,7 +155,6 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         // returns array('2012-12-xx'=>12, 'date' => id....)
 
         
-        
         foreach($notifytimes as $time){
            
             if (isset($old[$time])) {
@@ -213,44 +216,4 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         $n->delete(DB_DATAOBJECT_WHEREADD_ONLY);
     }
     
-    function toRooSingleArray($authUser, $request)
-    {
-        $ret = $this->toArray();
-        
-        if(!empty($ret['keyword_filters'])){
-            $keywords = array_unique(array_filter(explode(',', $ret['keyword_filters'])));
-            
-            $clipping_keywords = DB_DataObject::factory('clipping_keywords');
-            $clipping_keywords->whereAddIn('id', $keywords, 'int');
-            
-            $li = array();
-            
-            foreach ($clipping_keywords->fetchAll('id', 'keyword') as $k => $v){
-                $li[] = array(
-                    'id' => $k,
-                    'keyword' => $v
-                );
-            }
-            
-            $ret['keywords'] = json_encode($li);
-        }
-        
-        return $ret;
-    }
-    
-    function toRooArray($request)
-    {
-        $ret = $this->toArray();
-        
-        if(!empty($ret['keyword_filters'])){
-            $keywords = array_unique(array_filter(explode(',', $ret['keyword_filters'])));
-            
-            $clipping_keywords = DB_DataObject::factory('clipping_keywords');
-            $clipping_keywords->whereAddIn('id', $keywords, 'int');
-            
-            $ret['keywords'] = implode(',', $clipping_keywords->fetchAll('keyword'));
-        }
-        
-        return $ret;
-    }
 }