[PHPiCalendar-Commits] phpicalendar/functions/parse end_vevent.php, 1.24, 1.25

[<ji...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27793/functions/parse

Modified Files:
	end_vevent.php 
Log Message:
for bug 2525176 require sequence to increment for modified events.  Also fix uid handling

Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** end_vevent.php	2 Jan 2009 07:12:12 -0000	1.24
--- end_vevent.php	26 Jan 2009 05:07:38 -0000	1.25
***************
*** 30,35 ****
  	$uid_valid = false;
  }elseif(in_array($uid, $uid_list)) {
! 	$uid .= $uid_counter;
! 	$uid_counter++;
  }else{
  	$uid_valid = true;
--- 30,35 ----
  	$uid_valid = false;
  }elseif(in_array($uid, $uid_list)) {
! 	#$uid .= $uid_counter;
! 	#$uid_counter++;
  }else{
  	$uid_valid = true;
***************
*** 321,349 ****
  		}
  		if($this_date_tmp == $end_date_tmp && ($end_time == '0000')) continue;
! 		$master_array[$this_date_tmp][$time_key][$uid] = array (
! 			'event_start' => $start_time,                	# hhmm
! 			'event_end' => $end_time,                    	# hhmm
! 			'display_end' => $display_end_tmp,            	# hhmm display_start is $time_key
! 			'start_unixtime' => $start_unixtime_tmp,      	# start unixtime for this recurrence
! 			'end_unixtime' => $end_unixtime_tmp,          	# end unixtime for this recurrence
! 			'event_text' => $summary,                    	#
! 			'event_length' => $length,                    	# length in seconds
! 			'event_overlap' => 0,                        	# checkOverlap modifies this
! 			'description' => $description, 
! 			'status' => $status, 
! 			'class' => $class, 
! 			'spans_day' => $spans_day, 
! 			'location' => $location, 
! 			'categories' => $vtodo_categories, 
! 			'organizer' => serialize($organizer), 
! 			'attendee' => serialize($attendee), 
! 			'calnumber' => $calnumber, 
! 			'calname' => $actual_calname,
! 			'timezone' => $start_tz,
! 			'other' => trim($other),
! 			'geo' => $geo,
! 			'url' => $url, 
! 			'recur' => $recur
! 			);
  		if($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid);
  	}
--- 321,353 ----
  		}
  		if($this_date_tmp == $end_date_tmp && ($end_time == '0000')) continue;
! 		if(!isset($master_array[$this_date_tmp][$time_key][$uid]['sequence']) || 
! 			$sequence >  $master_array[$this_date_tmp][$time_key][$uid]['sequence']){
! 			$master_array[$this_date_tmp][$time_key][$uid] = array (
! 				'event_start' => $start_time,                	# hhmm
! 				'event_end' => $end_time,                    	# hhmm
! 				'display_end' => $display_end_tmp,            	# hhmm display_start is $time_key
! 				'start_unixtime' => $start_unixtime_tmp,      	# start unixtime for this recurrence
! 				'end_unixtime' => $end_unixtime_tmp,          	# end unixtime for this recurrence
! 				'event_text' => $summary,                    	#
! 				'event_length' => $length,                    	# length in seconds
! 				'event_overlap' => 0,                        	# checkOverlap modifies this
! 				'description' => $description, 
! 				'status' => $status, 
! 				'class' => $class, 
! 				'spans_day' => $spans_day, 
! 				'location' => $location, 
! 				'categories' => $vtodo_categories, 
! 				'organizer' => serialize($organizer), 
! 				'attendee' => serialize($attendee), 
! 				'calnumber' => $calnumber, 
! 				'calname' => $actual_calname,
! 				'timezone' => $start_tz,
! 				'other' => trim($other),
! 				'geo' => $geo,
! 				'url' => $url, 
! 				'sequence' => $sequence, 
! 				'recur' => $recur
! 				);
! 		}	
  		if($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid);
  	}