[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.186,1.187

[<da...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31543/functions

Modified Files:
	ical_parser.php 
Log Message:
Fixed SF Bug #1064410

The bug was when generating $recur_array, the code assumes for each pass, you're filling in $recur_array from $next_range_time to $next_range_time + $interval $freq_type, in this case $next_range_time to $next_range_time + 1 year. However, the previous code used the fixed year of $next_range time, making the range filled into $recur_event per pass (jan 01, year of $next_range_time) to (dec 31st, year of $next_range_time). There was a hack that tried to fix this by saying "assume next year if it's jan/feb", trying to compensate, but it just semi-papered over the issue since the ranges still didn't match up. The fix was to make sure the ranges actually did match up, by adjusting the year used each month. This also meant that a bunch of events outside of start/end_range are no longer rendered. Since the window now matches on a monthly basis, it will still generate events slightly outside of start/end_range, but it should now render correctly in all cases (the extra events are just slightly wasted space, but less wasted space than before). Note that this fixes a bunch of problems w/ rendering yearly events in dec/jan/feb (the year border), beyond the SF bug.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.186
retrieving revision 1.187
diff -C2 -d -r1.186 -r1.187
*** ical_parser.php	9 Nov 2004 20:53:11 -0000	1.186
--- ical_parser.php	6 May 2005 19:02:05 -0000	1.187
***************
*** 592,601 ****
  														$bymonth = array("$m");
  													}	
  													foreach($bymonth as $month) {
! 														// FIXME: Jan 1 does not display in December
! 														$year = date('Y', $next_range_time);
! 														if (($year != $this_year) && ($month < 3)) {
! 															$year = $this_year;
  														}
  														if ((isset($byday)) && (is_array($byday))) {
  															$checkdate_time = mktime(0,0,0,$month,1,$year);
--- 592,604 ----
  														$bymonth = array("$m");
  													}	
+ 
  													foreach($bymonth as $month) {
! 														// Make sure the month & year used is within the start/end_range.
! 														if ($month < date('m', $next_range_time)) {
! 															$year = date('Y', strtotime('+1 years', $next_range_time));
! 														} else {
! 															$year = date('Y', $next_range_time);
  														}
+ 
  														if ((isset($byday)) && (is_array($byday))) {
  															$checkdate_time = mktime(0,0,0,$month,1,$year);