[PHPiCalendar-Commits] phpicalendar/functions userauth_functions.php, 1.11, 1.12

[<par...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1209/functions

Modified Files:
	userauth_functions.php 
Log Message:
Fix repeating ampersands at the end of the URL on log in/log out. Fix use of 

Index: userauth_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/userauth_functions.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** userauth_functions.php	24 Dec 2009 17:24:30 -0000	1.11
--- userauth_functions.php	12 Jan 2010 19:33:41 -0000	1.12
***************
*** 8,12 ****
  
  	// Return the login query string.
! 	$querys = preg_replace('/&&/', '', $querys);
  	return $querys;
  }
--- 8,12 ----
  
  	// Return the login query string.
! 	$querys = preg_replace('/&&|&$/', '', $querys);
  	return $querys;
  }
***************
*** 18,22 ****
  	// Make sure the action is logout.
  	$querys = preg_replace('/action=[^&]+/', 'action=logout', $_SERVER['QUERY_STRING']);
! 	if ($querys == $QUERY_STRING) $querys .= '&action=logout';
  
  	// Remove references to the username or password.
--- 18,22 ----
  	// Make sure the action is logout.
  	$querys = preg_replace('/action=[^&]+/', 'action=logout', $_SERVER['QUERY_STRING']);
! 	if ($querys == $_SERVER['QUERY_STRING']) $querys .= '&action=logout';
  
  	// Remove references to the username or password.
***************
*** 24,28 ****
  
  	// Return the logout query string.
! 	$querys = preg_replace('/&&/', '', $querys);
  	return $querys;
  }
--- 24,28 ----
  
  	// Return the logout query string.
! 	$querys = preg_replace('/&&|&$/', '', $querys);
  	return $querys;
  }