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 d979476..1532197 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()
@@ -83,6 +84,10 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
         list($start, $end) = $this->notifytimesRange($advance);
         
+        print_R($start);
+        echo "<br/>";
+        print_r($end);exit;
+        
         if (strtotime($start) > strtotime($end)) {
             return array(); // no data..
         }
@@ -212,26 +217,4 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         $n->delete(DB_DATAOBJECT_WHEREADD_ONLY);
     }
     
-    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'] = array();
-            
-            foreach ($clipping_keywords->fetchAll('id', 'keyword') as $k => $v){
-                $ret['keywords'][] = array(
-                    'id' => $k,
-                    'keyword' => $v
-                );
-            }
-        }
-        
-        return $ret;
-    }
 }