[phpMyChat CVS] CVS: phpMyChat-0.15/chat/lib/commands banish.cmd.php3,1.1,1.2

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

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

Modified Files:
	banish.cmd.php3 
Log Message:
Rename the 'targetRoom' session variable to 'currentRoom'

Index: banish.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/banish.cmd.php3,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** banish.cmd.php3	2001/04/04 23:52:33	1.1
--- banish.cmd.php3	2001/04/08 18:24:05	1.2
***************
*** 50,54 ****
  	// user from their current room
  	$queryRoomPart	= ($dbSessionVars['status'] == 'm')
! 					? 'room = \'' . pmcSlashSingleQuotes($dbSessionVars['targetRoom']) . '\' AND '
  					: '';
  	// Ensure the user to be banished is logged in (into the current room for moderators)
--- 50,54 ----
  	// user from their current room
  	$queryRoomPart	= ($dbSessionVars['status'] == 'm')
! 					? 'room = \'' . pmcSlashSingleQuotes($dbSessionVars['currentRoom']) . '\' AND '
  					: '';
  	// Ensure the user to be banished is logged in (into the current room for moderators)
***************
*** 126,131 ****
  			$dbLink->query("UPDATE " . C_USR_TBL . " SET u_time='" . time() . "', status='b' WHERE username = '$slashedTarget'");
  			
! 			// banishment confirmation message
! 			$error				= sprintf(L_BANISHED, $cmd[2]);
  			$isCommand			= true;
  			$doRefreshMessages	= true;
--- 126,134 ----
  			$dbLink->query("UPDATE " . C_USR_TBL . " SET u_time='" . time() . "', status='b' WHERE username = '$slashedTarget'");
  			
! 			// banishment confirmation message when an user has been banished
! 			// from an other room than the current one
! 			if ($targetCurrentRoom != pmcSlashSingleQuotes($dbSessionVars['currentRoom']))
! 				$error			= sprintf(L_BANISHED, $cmd[2]);
! 
  			$isCommand			= true;
  			$doRefreshMessages	= true;