X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=c4d393c4c7f3084baee81cb7e700d1f01339cea0;hb=be7666f1e8a6a7f21f4ac65a7065375d3ec2b0b0;hp=3786d18053d731e8b7a8bdee8c153edd081bb162;hpb=9597395d35ce85a1987d06977bde274edc07049a;p=Pman.Core

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 3786d180..c4d393c4 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -82,7 +82,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         // it starts 24 hours ago.. or when dtstart
         
         list($start, $end) = $this->notifytimesRange($advance);
-        
+        print_r($this->notifytimesRange($advance));exit;
         if (strtotime($start) > strtotime($end)) {
             return array(); // no data..
         }
@@ -116,7 +116,7 @@ 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));
-                $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');
             }
         }
@@ -127,6 +127,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->find();
         
         while($w->fetch()){
@@ -141,7 +142,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()');
@@ -212,15 +213,44 @@ 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;
     }
 }