DataObjects/Core_notify_recur.php

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 4f50baf..0da4f39 100644 (file)
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -57,68 +57,66 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
         // make a list of datetimes when notifies need to be generated for.
         // it starts 24 hours ago.. or when dtstart
-        print_r($this);
+        //print_r($this);
         list($start, $end) = $this->notifytimesRange($advance);
         
         if (strtotime($start) > strtotime($end)) {
             return array(); // no data..
         }
-        
+        $ret = array();
+        print_r($this->freq_day);
         if($this->freq_day){
-            // happens every day based on freq_hour.
-            $hours = explode(',', $this->freq_hour);
-            for ($day = date('Y-m-d', strtotime($start));
-                    strtotime($day) < strtotime($end);
-                    $day = date('Y-m-d', strtotime("$day + 1 DAY")))
-            {
-                foreach($hours as $h) {
-                    $hh = strpos($h,":") > 0 ? $h : "$H:00";
-                    $ret[] = $day . ' ' . $hh;
-                }
-            }
-            return $this->applyTimezoneToList($ret);
+            
         }
         if($this->freq_hour){
-            $hours = explode(',', $this->freq_hour);
-            if (!$hours) {
-                $hours = array(date('H:i', strtotime($this->dtstart)));
-            }
-
-            $days = explode(','. $this->freq_day);
-
-            for ($day = date('Y-m-d', strtotime($start));
-                    strtotime($day) < strtotime($end);
-                    $day = date('Y-m-d', strtotime("$day + 1 DAY")))
-            {
-                // skip days not accounted for..
-                if (!in_array(date('N', strtotime($day)), $days)) {
-                    continue;
+            
+        }
+        switch($this->freq) {
+            case 'HOURLY':
+                // happens every day based on freq_hour.
+                $hours = explode(',', $this->freq_hour);
+                for ($day = date('Y-m-d', strtotime($start));
+                        strtotime($day) < strtotime($end);
+                        $day = date('Y-m-d', strtotime("$day + 1 DAY")))
+                {
+                    foreach($hours as $h) {
+                        $hh = strpos($h,":") > 0 ? $h : "$H:00";
+                        $ret[] = $day . ' ' . $hh;
+                    }
                 }
-
-                foreach($hours as $h) {
-                    $hh = strpos($h,":") > 0 ? $h : "$H:00";
-                    $ret[] = $day . ' ' . $hh;
+                return $this->applyTimezoneToList($ret);
+                
+            case 'DAILY':
+                $hours = explode(',', $this->freq_hour);
+                if (!$hours) {
+                    $hours = array(date('H:i', strtotime($this->dtstart)));
                 }
-            }
-
-            return $this->applyTimezoneToList($ret);
+                
+                $days = explode(','. $this->freq_day);
+                
+                for ($day = date('Y-m-d', strtotime($start));
+                        strtotime($day) < strtotime($end);
+                        $day = date('Y-m-d', strtotime("$day + 1 DAY")))
+                {
+                    // skip days not accounted for..
+                    if (!in_array(date('N', strtotime($day)), $days)) {
+                        continue;
+                    }
+                    
+                    foreach($hours as $h) {
+                        $hh = strpos($h,":") > 0 ? $h : "$H:00";
+                        $ret[] = $day . ' ' . $hh;
+                    }
+                }
+                
+                return $this->applyTimezoneToList($ret);
+                
+                
+            case 'MONTHLY': // ignored..
+            case 'YEARLY': // ignored..
+                break;
+            
         }
-//        switch($this->freq) {
-//            case 'HOURLY':
-//                
-//                
-//                
-//                
-//                
-//            case 'DAILY':
-//                
-//                
-//                
-//            case 'MONTHLY': // ignored..
-//            case 'YEARLY': // ignored..
-//                break;
-//            
-//        }
          
     }
     function applyTimezoneToList($ar)