[PHPiCalendar-Commits] phpicalendar/functions/parse end_vevent.php, 1.25, 1.26 parse_tzs.php, 1.10, 1.11

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

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

Modified Files:
	end_vevent.php parse_tzs.php 
Log Message:
autoincrement sequence if it is missing

Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** end_vevent.php	26 Jan 2009 05:07:38 -0000	1.25
--- end_vevent.php	8 Apr 2009 04:42:59 -0000	1.26
***************
*** 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 seen before. If sequence is the default, bump it.
! 	if ($sequence == 0) $sequence++;
  }else{
  	$uid_valid = true;
***************
*** 322,326 ****
  		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
--- 322,327 ----
  		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

Index: parse_tzs.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/parse_tzs.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** parse_tzs.php	2 Jan 2009 07:12:12 -0000	1.10
--- parse_tzs.php	8 Apr 2009 04:42:59 -0000	1.11
***************
*** 3,7 ****
  if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $filename));
  $nextline = fgets($ifile);
! if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($lang['l_error_invalidcal'], $filename));
  
  // read file in line by line
--- 3,7 ----
  if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $filename));
  $nextline = fgets($ifile);
! #if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($lang['l_error_invalidcal'], $filename));
  
  // read file in line by line