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 0224606..d8274cc 100644 (file)
--- 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,7 +110,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 $usedays[] = date("Y-m-d", $ut);
             }
         }
-                
+               
         //print_r($this);
         
         
@@ -141,7 +142,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()');
@@ -212,44 +213,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;
-    }
 }