phpmychat-cvs-commited

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

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

Modified Files:
	main_index.lib.php3 do_enter_db_work.lib.php3 
Log Message:
Rename the 'targetRoom' session variable to 'currentRoom'

Index: main_index.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/main_index.lib.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** main_index.lib.php3	2001/04/04 16:23:13	1.5
--- main_index.lib.php3	2001/04/08 18:24:05	1.6
***************
*** 206,210 ****
  {
  	$nickForNotifications	= pmcSlashSingleQuotes(pmcSlashSingleQuotes(pmcSpecialChars($slashedNick, $latin1)));
! 	$exitedRoomName			= pmcSlashSingleQuotes($dbSessionVars['targetRoom']);
  	$exitedRoomType			= $dbSessionVars['roomType'];
  	$dbLink->query("INSERT INTO " . C_MSG_TBL . " VALUES ($exitedRoomType, '$exitedRoomName', 'SYS exit', '', " . time() . ", NULL, '#666699', 'sprintf(L_EXIT_ROM, \'$nickForNotifications\')', 'sprintf(L_EXIT_ROM, \'$nickForNotifications\')')");
--- 206,210 ----
  {
  	$nickForNotifications	= pmcSlashSingleQuotes(pmcSlashSingleQuotes(pmcSpecialChars($slashedNick, $latin1)));
! 	$exitedRoomName			= pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
  	$exitedRoomType			= $dbSessionVars['roomType'];
  	$dbLink->query("INSERT INTO " . C_MSG_TBL . " VALUES ($exitedRoomType, '$exitedRoomName', 'SYS exit', '', " . time() . ", NULL, '#666699', 'sprintf(L_EXIT_ROM, \'$nickForNotifications\')', 'sprintf(L_EXIT_ROM, \'$nickForNotifications\')')");
***************
*** 233,237 ****
  {
  	$roomType	= $dbSessionVars['roomType'];
! 	$targetRoom	= $dbSessionVars['targetRoom'];
  	$jsVersion	= $dbSessionVars['jsVersion'];
  }
--- 233,237 ----
  {
  	$roomType	= $dbSessionVars['roomType'];
! 	$targetRoom	= $dbSessionVars['currentRoom'];
  	$jsVersion	= $dbSessionVars['jsVersion'];
  }
***************
*** 495,500 ****
  		$layoutNick = '';
  		
! 	if (dbSessionIsRegistered('targetRoom'))
! 		$layoutRoom = $dbSessionVars['targetRoom'];
  	else if (isset($GLOBALS['cookieRoom']))
  		$layoutRoom = $GLOBALS['cookieRoom'];
--- 495,500 ----
  		$layoutNick = '';
  		
! 	if (dbSessionIsRegistered('currentRoom'))
! 		$layoutRoom = $dbSessionVars['currentRoom'];
  	else if (isset($GLOBALS['cookieRoom']))
  		$layoutRoom = $GLOBALS['cookieRoom'];

Index: do_enter_db_work.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/do_enter_db_work.lib.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** do_enter_db_work.lib.php3	2001/04/04 09:05:36	1.2
--- do_enter_db_work.lib.php3	2001/04/08 18:24:05	1.3
***************
*** 195,199 ****
  $dbSessionVars['pwdHash']			= $pwdHash;
  $dbSessionVars['roomType']			= $roomType;
! $dbSessionVars['targetRoom']		= $targetRoom;
  $dbSessionVars['status']			= (empty($status)) ? 'u' : $status;
  $dbSessionVars['refreshDelay']		= C_MSG_REFRESH;
--- 195,199 ----
  $dbSessionVars['pwdHash']			= $pwdHash;
  $dbSessionVars['roomType']			= $roomType;
! $dbSessionVars['currentRoom']		= $targetRoom;
  $dbSessionVars['status']			= (empty($status)) ? 'u' : $status;
  $dbSessionVars['refreshDelay']		= C_MSG_REFRESH;