Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12865/phpicalendar/functions
Modified Files:
end_vevent.php
Log Message:
treat single events as recurrences with one instance...fix various date calc bugs
Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/end_vevent.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** end_vevent.php 11 Oct 2007 23:49:08 -0000 1.1
--- end_vevent.php 12 Oct 2007 06:53:09 -0000 1.2
***************
*** 14,18 ****
// Handle DURATION
! if (!isset($end_unixtime) && isset($the_duration)) {
$end_unixtime = $start_unixtime + $the_duration;
$end_time = date ('Hi', $end_unixtime);
--- 14,19 ----
// Handle DURATION
! if (!isset($end_unixtime)) {
! if(!isset($the_duration)) $the_duration = 0;
[...1234 lines suppressed...]
+ 'url' => $url,
+ 'recur' => $recur);
+ if (isset($display_end_tmp)){
+ $master_array[($recur_data_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp;
+ }
+ checkOverlap($recur_data_date, ($hour.$minute), $uid);
}
}
}
}
}
}
! } #end while loop
! } # end if time compare
! unset($recur_data);
! } # end switch $key (rrule type)
! } # end foreach rrule
!
// This should remove any exdates that were missed.
|
