[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.170,1.171 userauth_functions.php,1.1,1.2

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19795/functions

Modified Files:
	ical_parser.php userauth_functions.php 
Log Message:
Changes.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** ical_parser.php	28 May 2004 16:33:48 -0000	1.170
--- ical_parser.php	22 Jul 2004 02:25:42 -0000	1.171
***************
*** 284,288 ****
  					}
  					// Changed for 1.0, basically write out the entire event if it starts while the array is written.
! 					if ($start < $mArray_end) {
  						while (($start != $end) && ($start < $mArray_end)) {
  							$start_date2 = date('Ymd', $start);
--- 284,288 ----
  					}
  					// Changed for 1.0, basically write out the entire event if it starts while the array is written.
! 					if (($start < $mArray_end) && ($start < $end)) {
  						while (($start != $end) && ($start < $mArray_end)) {
  							$start_date2 = date('Ymd', $start);
***************
*** 573,578 ****
  													break;
  												case 'YEARLY':
! 												
! 													if (!isset($bymonth)) {
  														$m = date('m', $start_date_time);
  														$bymonth = array("$m");
--- 573,577 ----
  													break;
  												case 'YEARLY':
! 													if ((!isset($bymonth)) || (sizeof($bymonth) == 0)) {
  														$m = date('m', $start_date_time);
  														$bymonth = array("$m");
***************
*** 607,611 ****
  															$day 	= date('d', $start_date_time);
  															$next_date_time = mktime(0,0,0,$month,$day,$year);
! 															//echo date('Ymd',$next_range_time).$summary.'<br>';
  														}
  														$recur_data[] = $next_date_time;
--- 606,610 ----
  															$day 	= date('d', $start_date_time);
  															$next_date_time = mktime(0,0,0,$month,$day,$year);
! 															//echo date('Ymd',$next_date_time).$summary.'<br>';
  														}
  														$recur_data[] = $next_date_time;

Index: userauth_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/userauth_functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** userauth_functions.php	14 May 2004 21:09:16 -0000	1.1
--- userauth_functions.php	22 Jul 2004 02:25:42 -0000	1.2
***************
*** 97,101 ****
  	
  	// Check to make sure the username and password is valid.
! 	if (!key_exists("$username:$password", $locked_map)) {
  		// Remember the invalid login, because we may want to display
  		// a message elsewhere or check validity.
--- 97,101 ----
  	
  	// Check to make sure the username and password is valid.
! 	if (!array_key_exists("$username:$password", $locked_map)) {
  		// Remember the invalid login, because we may want to display
  		// a message elsewhere or check validity.