[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.100,1.101

[<jo...@us...>]

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

Modified Files:
	ical_parser.php 
Log Message:
Bug Tracker [795795] Fix event data variable handling.

Applied submitted patch. Calendar parsing code reuses variables to
populate calendar event data. The code was not clearing those
variables before reuse, causing event data to carry over from one
event to another if the second event did not overwrite the previous
value.

Also adds organizer, location, and attendee event fields to the
recurring event data.


Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** ical_parser.php	17 Sep 2003 04:34:20 -0000	1.100
--- ical_parser.php	17 Sep 2003 20:38:12 -0000	1.101
***************
*** 563,572 ****
  															}
  															$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, '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' => true, 'calnumber' => $calnumber);
  															$start_tmp = strtotime('+1 day',$start_tmp);
  														}
  													} else {
  														$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, '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, 'calnumber' => $calnumber);
  													}
  												}
--- 563,572 ----
  															}
  															$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, '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' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
  															$start_tmp = strtotime('+1 day',$start_tmp);
  														}
  													} else {
  														$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, '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);
  													}
  												}
***************
*** 580,583 ****
--- 580,586 ----
  					}
  				}
+ 
+                                // Clear event data now that it's been saved.
+                                unset($start_time, $start_time_tmp, $end_time, $end_time_tmp, $start_unixtime, $start_unixtime_tmp, $end_unixtime, $end_unixtime_tmp, $summary, $length, $nbrOfOverlaps, $description, $status, $class, $location, $organizer, $attendee);
  			
  			// Begin VTODO Support