[phpMyChat CVS] CVS: phpMyChat-0.15/chat/lib/index_libs main_index.lib.php3,1.18,1.19

[Lo?c C. <lo...@us...>]

Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs
In directory usw-pr-cvs1:/tmp/cvs-serv13523/chat/lib/index_libs

Modified Files:
	main_index.lib.php3 
Log Message:
A required validation was bypassed and the form displays now the more accurate values for fields

Index: main_index.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/main_index.lib.php3,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** main_index.lib.php3	2001/04/19 08:59:43	1.18
--- main_index.lib.php3	2001/04/19 20:28:14	1.19
***************
*** 24,28 ****
  // |    http://www.phpheaven.net/projects/phpMyChat/                          |
  // |                                                                          |
! // | Authors: the phpHeaven-team <php...@ya...>             |
  // +--------------------------------------------------------------------------+
  //
--- 24,28 ----
  // |    http://www.phpheaven.net/projects/phpMyChat/                          |
  // |                                                                          |
! // | Authors: the phpHeaven-team <te...@ph...>                         |
  // +--------------------------------------------------------------------------+
  //
***************
*** 324,328 ****
  	 * 'chat/lib/common.lib.php3' library
  	 */
! 	else if ($reloading == 'joinCmd')
  	{
  		$dbLink->query("SELECT perms, rooms FROM " . C_REG_TBL . " WHERE username = '$slashedNick' LIMIT 1");
--- 324,328 ----
  	 * 'chat/lib/common.lib.php3' library
  	 */
! 	else if ($reloading == 'joinCmd' || $reloading == 'joinLink')
  	{
  		$dbLink->query("SELECT perms, rooms FROM " . C_REG_TBL . " WHERE username = '$slashedNick' LIMIT 1");
***************
*** 503,508 ****
  	global $dbSessionVars;
  
! 	// Try to get some data from session or cookies
! 	if (dbSessionIsRegistered('nick'))
  		$layoutNick = $dbSessionVars['nick'];
  	else if (isset($GLOBALS['cookieUsername']))
--- 503,510 ----
  	global $dbSessionVars;
  
! 	// Try to get the most accurate values for the form fields below
! 	if (!empty($GLOBALS['nick']))
! 		$layoutNick = $GLOBALS['nick'];
! 	else if (dbSessionIsRegistered('nick'))
  		$layoutNick = $dbSessionVars['nick'];
  	else if (isset($GLOBALS['cookieUsername']))
***************
*** 511,515 ****
  		$layoutNick = '';
  
! 	if (dbSessionIsRegistered('currentRoom'))
  		$layoutRoom = $dbSessionVars['currentRoom'];
  	else if (isset($GLOBALS['cookieRoom']))
--- 513,523 ----
  		$layoutNick = '';
  
! 	if (!empty($GLOBALS['enterDefaultRoomName']))
! 		$layoutRoom = $GLOBALS['enterDefaultRoomName'];
! 	else if (!empty($GLOBALS['enterOtherRoomName']))
! 		$layoutRoom = $GLOBALS['enterOtherRoomName'];
! 	else if (!empty($GLOBALS['createRoomName']))
! 		$layoutRoom = $GLOBALS['createRoomName'];
! 	else if (dbSessionIsRegistered('currentRoom'))
  		$layoutRoom = $dbSessionVars['currentRoom'];
  	else if (isset($GLOBALS['cookieRoom']))
***************
*** 518,522 ****
  		$layoutRoom = '';
  
! 	if (dbSessionIsRegistered('roomType'))
  		$layoutRoomType = $dbSessionVars['roomType'];
  	else if (isset($GLOBALS['cookieRoomType']))
--- 526,532 ----
  		$layoutRoom = '';
  
! 	if (!empty($GLOBALS['createRoomName']) && !empty($GLOBALS['roomType']))
! 		$layoutRoomType = $GLOBALS['roomType'];
! 	else if (dbSessionIsRegistered('roomType'))
  		$layoutRoomType = $dbSessionVars['roomType'];
  	else if (isset($GLOBALS['cookieRoomType']))