X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=e090229ac6524adb14f9e23aca6c7cd902b5b57f;hb=f34c81b4e069647f025b44a14384ac4856c5fc40;hp=d5389fcc17fbef6616bbc18f7d85809fe0142a20;hpb=e0ce3c3f4b285c6d2746f1affd472abb18d9326c;p=Pman.Core

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index d5389fcc..e090229a 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -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()');
@@ -171,6 +172,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 unset($old[$time]);
                continue;
             }
+            print_R($time);exit;
             // do not have a notify event... creat it..
             $add = DB_DataObject::factory('core_notify');
             $add->setFrom(array(
@@ -212,7 +214,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         $n->delete(DB_DATAOBJECT_WHEREADD_ONLY);
     }
     
-    function toRooArray($request)
+    function toRooSingleArray($authUser, $request)
     {
         $ret = $this->toArray();
         
@@ -222,17 +224,34 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
             $clipping_keywords = DB_DataObject::factory('clipping_keywords');
             $clipping_keywords->whereAddIn('id', $keywords, 'int');
             
-            $ret['keywords'] = array();
+            $li = array();
             
             foreach ($clipping_keywords->fetchAll('id', 'keyword') as $k => $v){
-                $ret['keywords'][] = array(
+                $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;
     }
 }