[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.126,1.127

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

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

Modified Files:
	ical_parser.php 
Log Message:
Corrected a mistake with overlaps and newly installed bleed time.


Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** ical_parser.php	16 Nov 2003 06:12:39 -0000	1.126
--- ical_parser.php	16 Nov 2003 06:20:08 -0000	1.127
***************
*** 273,277 ****
  						// This if statement should prevent writing of an excluded date if its the first recurrance - CL
  						if (!in_array($start_date, $except_dates)) {
! 							$nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time, $uid);
  							$master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, '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' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber );
  							if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true;
--- 273,277 ----
  						// This if statement should prevent writing of an excluded date if its the first recurrance - CL
  						if (!in_array($start_date, $except_dates)) {
! 							$nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time_tmp1, $uid);
  							$master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, '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' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber );
  							if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true;
***************
*** 617,621 ****
  														$until_check = $recur_data_date.$hour.$minute.'00';
  														if ($abs_until > $until_check) {
! 															$nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time, $uid);
  															$master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
  														}
--- 617,621 ----
  														$until_check = $recur_data_date.$hour.$minute.'00';
  														if ($abs_until > $until_check) {
! 															$nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time_tmp1, $uid);
  															$master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
  														}