Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/functions
Modified Files:
ical_parser.php
Log Message:
Fixed Memorial Day for ical holidays.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** ical_parser.php 19 May 2004 05:50:09 -0000 1.160
--- ical_parser.php 19 May 2004 06:50:57 -0000 1.161
***************
*** 527,531 ****
}
$next_date = date('Ymd', $next_date_time);
- //$recur_data[] = $next_date_time;
}
}
--- 527,530 ----
***************
*** 538,541 ****
--- 537,541 ----
}
foreach($bymonth as $month) {
+ // Something is wrong with this range
$year = date('Y', $next_range_time);
if ((isset($byday)) && (is_array($byday))) {
***************
*** 543,548 ****
foreach($byday as $day) {
ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr);
! $nth = $byday_arr[2]-1;
$on_day = two2threeCharDays($byday_arr[3]);
if ($byday_arr[1] == '-') {
$last_day_tmp = date('t',$checkdate_time);
--- 543,553 ----
foreach($byday as $day) {
ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr);
! if ($byday_arr[2] != '') {
! $nth = $byday_arr[2]-1;
! } else {
! $nth = 0;
! }
$on_day = two2threeCharDays($byday_arr[3]);
+ $on_day_num = two2threeCharDays($byday_arr[3],false);
if ($byday_arr[1] == '-') {
$last_day_tmp = date('t',$checkdate_time);
***************
*** 557,560 ****
--- 562,566 ----
$day = date('d', $start_date_time);
$next_date_time = mktime(0,0,0,$month,$day,$year);
+ //echo date('Ymd',$next_range_time).$summary.'<br>';
}
$recur_data[] = $next_date_time;
***************
*** 574,578 ****
$recur_data[] = $next_date_time;
}
! }
break;
default:
--- 580,584 ----
$recur_data[] = $next_date_time;
}
! }
break;
default:
|
