diff options
| author | Jim Hu <jimhu@users.sourceforge.net> | 2008-12-26 08:26:31 +0000 |
|---|---|---|
| committer | Jim Hu <jimhu@users.sourceforge.net> | 2008-12-26 08:26:31 +0000 |
| commit | b8cc4f61ed18ee4bb8fcedb5a836e7bab9ecbbe4 (patch) | |
| tree | ab2d8af1f6fa3aadab110842f304d4bf7f6b5d5e /functions/parse/recur_functions.php | |
| parent | 7d565474b41400bfce2d665da96d39631458eda3 (diff) | |
| download | phpicalendar-b8cc4f61ed18ee4bb8fcedb5a836e7bab9ecbbe4.tar.gz phpicalendar-b8cc4f61ed18ee4bb8fcedb5a836e7bab9ecbbe4.tar.bz2 phpicalendar-b8cc4f61ed18ee4bb8fcedb5a836e7bab9ecbbe4.zip | |
expand search range;fix todo display
Diffstat (limited to 'functions/parse/recur_functions.php')
| -rw-r--r-- | functions/parse/recur_functions.php | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/functions/parse/recur_functions.php b/functions/parse/recur_functions.php index 2328e4b..8daa71d 100644 --- a/functions/parse/recur_functions.php +++ b/functions/parse/recur_functions.php @@ -10,19 +10,21 @@ We will use two kinds of functions - those that restrict the date to allowed val function add_recur($times,$freq=''){ global $recur_data; - global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime, $day_offset; + global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime, $day_offset, $current_view; if (!is_array($times)) $times = array($times); /* BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS */ #dump_times($times); - $times = restrict_bymonth($times,$freq); -# $times = restrict_byweekno($times,$freq); - $times = restrict_byyearday($times,$freq); - $times = restrict_bymonthday($times,$freq); - $times = restrict_byday($times,$freq); - if($start_date_unixtime > $mArray_begin) $times[] = $start_date_unixtime; - $times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos"; - $times = array_unique($times); - sort($times); + if ($current_view != 'search'){ + $times = restrict_bymonth($times,$freq); + # $times = restrict_byweekno($times,$freq); + $times = restrict_byyearday($times,$freq); + $times = restrict_bymonthday($times,$freq); + $times = restrict_byday($times,$freq); + if($start_date_unixtime > $mArray_begin) $times[] = $start_date_unixtime; + $times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos"; + $times = array_unique($times); + sort($times); + } $until_date = date("Ymd",$end_range_unixtime); foreach ($times as $time){ #echo "time:". date("Ymd",$time)."\n"; |