[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.134,1.135

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv25980/functions

Modified Files:
	ical_parser.php 
Log Message:
Fixed some other bleed_time issues, now any bleeding event displays the 
real end time no matter if its split or not.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** ical_parser.php	23 Nov 2003 01:54:19 -0000	1.134
--- ical_parser.php	23 Nov 2003 21:41:51 -0000	1.135
***************
*** 255,260 ****
  							} else {
  								$end_time_tmp = '2400';
! 								$display_end_tmp = '0000';
  							}
  							$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
  							$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url );
--- 255,261 ----
  							} else {
  								$end_time_tmp = '2400';
! 								$display_end_tmp = $end_time;
  							}
+ 							
  							$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
  							$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url );
***************
*** 599,607 ****
  															} else {
  																$end_time_tmp = '2400';
! 																$display_end_tmp = '0000';
  															}
  															
  															// Let's double check the until to not write past it
! 															$until_check = $recur_data_date.$time_tmp.'00';
  															if ($abs_until > $until_check) {
  																$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
--- 600,608 ----
  															} else {
  																$end_time_tmp = '2400';
! 																$display_end_tmp = $end_time;
  															}
  															
  															// Let's double check the until to not write past it
! 															$until_check = $start_date_tmp.$time_tmp.'00';
  															if ($abs_until > $until_check) {
  																$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);