|
From: Lo?c C. <lo...@us...> - 2001-04-08 18:24:09
|
Update of /cvsroot/phpmychat/phpMyChat-0.15/chat
In directory usw-pr-cvs1:/tmp/cvs-serv32137/chat
Modified Files:
whois_popup.php3 users_popup_low.php3 users_popup.php3
users_low.php3 users.php3 messages_low.php3 loader.php3
input.php3 handle_input.php3
Log Message:
Rename the 'targetRoom' session variable to 'currentRoom'
Index: whois_popup.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/whois_popup.php3,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** whois_popup.php3 2001/04/04 23:52:33 1.1
--- whois_popup.php3 2001/04/08 18:24:04 1.2
***************
*** 122,126 ****
case 'moderator':
! if (pmcIsInto($dbSessionVars['targetRoom'], $rooms) > 0)
{
$perms = '<i>' . L_WHOIS_MODER . '</i>';
--- 122,126 ----
case 'moderator':
! if (pmcIsInto($dbSessionVars['currentRoom'], $rooms) > 0)
{
$perms = '<i>' . L_WHOIS_MODER . '</i>';
Index: users_popup_low.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users_popup_low.php3,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** users_popup_low.php3 2001/04/04 16:21:23 1.1
--- users_popup_low.php3 2001/04/08 18:24:04 1.2
***************
*** 80,85 ****
* 'chat/lib/common.lib.php3' script.
*/
! $roomQueryPart = (dbSessionIsRegistered('targetRoom') && $dbSessionVars['roomType'] == 0)
! ? '(m.type = 1 OR (m.type = 0 AND m.room =\'' . pmcSlashSingleQuotes($dbSessionVars['targetRoom']) . '\'))'
: 'm.type = 1';
--- 80,85 ----
* 'chat/lib/common.lib.php3' script.
*/
! $roomQueryPart = (dbSessionIsRegistered('currentRoom') && $dbSessionVars['roomType'] == 0)
! ? '(m.type = 1 OR (m.type = 0 AND m.room =\'' . pmcSlashSingleQuotes($dbSessionVars['currentRoom']) . '\'))'
: 'm.type = 1';
Index: users_popup.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users_popup.php3,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** users_popup.php3 2001/04/04 16:21:23 1.1
--- users_popup.php3 2001/04/08 18:24:04 1.2
***************
*** 79,84 ****
* 'chat/lib/common.lib.php3' script.
*/
! $roomQueryPart = (dbSessionIsRegistered('targetRoom') && $dbSessionVars['roomType'] == 0)
! ? '(m.type = 1 OR (m.type = 0 AND m.room =\'' . pmcSlashSingleQuotes($dbSessionVars['targetRoom']) . '\'))'
: 'm.type = 1';
--- 79,84 ----
* 'chat/lib/common.lib.php3' script.
*/
! $roomQueryPart = (dbSessionIsRegistered('currentRoom') && $dbSessionVars['roomType'] == 0)
! ? '(m.type = 1 OR (m.type = 0 AND m.room =\'' . pmcSlashSingleQuotes($dbSessionVars['currentRoom']) . '\'))'
: 'm.type = 1';
Index: users_low.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users_low.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** users_low.php3 2001/04/04 16:19:55 1.2
--- users_low.php3 2001/04/08 18:24:04 1.3
***************
*** 101,105 ****
$slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
$currentRoomType = $dbSessionVars['roomType'];
! $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['targetRoom']);
$usersList = array();
--- 101,105 ----
$slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
$currentRoomType = $dbSessionVars['roomType'];
! $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
$usersList = array();
***************
*** 141,145 ****
$usersList[] = '<!-- The current room -->';
$usersList[] = '<p>';
! $usersList[] = '<b>' . htmlspecialchars($dbSessionVars['targetRoom']) . '</b>'
. '<span class="small">'
. '<bdo dir="' . $textDirection . '"></bdo>'
--- 141,145 ----
$usersList[] = '<!-- The current room -->';
$usersList[] = '<p>';
! $usersList[] = '<b>' . htmlspecialchars($dbSessionVars['currentRoom']) . '</b>'
. '<span class="small">'
. '<bdo dir="' . $textDirection . '"></bdo>'
***************
*** 350,354 ****
// Display this room name when it hadn't been displayed yet
! if (strcasecmp($tmpRoom, $dbSessionVars['targetRoom']) != 0
&& (!isset($childCnt) || !isset($childCnt[$id])))
{
--- 350,354 ----
// Display this room name when it hadn't been displayed yet
! if (strcasecmp($tmpRoom, $dbSessionVars['currentRoom']) != 0
&& (!isset($childCnt) || !isset($childCnt[$id])))
{
Index: users.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users.php3,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** users.php3 2001/04/04 16:19:55 1.6
--- users.php3 2001/04/08 18:24:04 1.7
***************
*** 100,104 ****
$slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
$currentRoomType = $dbSessionVars['roomType'];
! $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['targetRoom']);
$usersList = array();
--- 100,104 ----
$slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
$currentRoomType = $dbSessionVars['roomType'];
! $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
$usersList = array();
***************
*** 139,143 ****
$usersCnt = 0;
$usersList[] = '<!-- The current room -->';
! $usersList[] = '<b>' . htmlspecialchars($dbSessionVars['targetRoom']) . '</b>'
. '<span class="small">'
. '<bdo dir="' . $textDirection . '"></bdo>'
--- 139,143 ----
$usersCnt = 0;
$usersList[] = '<!-- The current room -->';
! $usersList[] = '<b>' . htmlspecialchars($dbSessionVars['currentRoom']) . '</b>'
. '<span class="small">'
. '<bdo dir="' . $textDirection . '"></bdo>'
***************
*** 358,362 ****
// Display this room name when it hadn't been displayed yet
! if (strcasecmp($tmpRoom, $dbSessionVars['targetRoom']) != 0
&& (!isset($childCnt) || !isset($childCnt[$id])))
{
--- 358,362 ----
// Display this room name when it hadn't been displayed yet
! if (strcasecmp($tmpRoom, $dbSessionVars['currentRoom']) != 0
&& (!isset($childCnt) || !isset($childCnt[$id])))
{
Index: messages_low.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/messages_low.php3,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** messages_low.php3 2001/04/03 20:14:52 1.1
--- messages_low.php3 2001/04/08 18:24:04 1.2
***************
*** 77,81 ****
$slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
$currentRoomType = $dbSessionVars['roomType'];
! $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['targetRoom']);
require('./lib/check_and_kick_user.lib.' . C_EXTENSION);
pmcCheckAndKickUser(true);
--- 77,81 ----
$slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
$currentRoomType = $dbSessionVars['roomType'];
! $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
require('./lib/check_and_kick_user.lib.' . C_EXTENSION);
pmcCheckAndKickUser(true);
***************
*** 100,106 ****
if ($ignoredSendersList != '')
$ignoredSendersList = 'username NOT IN (' . $ignoredSendersList . ') AND ';
-
- $slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
- $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['targetRoom']);
$getMessagesQuery = 'SELECT username, latin1, m_time, address, color, msg_' . $dbSessionVars['msgKind'] . ' '
--- 100,103 ----
Index: loader.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/loader.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** loader.php3 2001/04/04 08:37:41 1.2
--- loader.php3 2001/04/08 18:24:04 1.3
***************
*** 81,85 ****
$slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
$currentRoomType = $dbSessionVars['roomType'];
! $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['targetRoom']);
require('./lib/check_and_kick_user.lib.' . C_EXTENSION);
pmcCheckAndKickUser(true);
--- 81,85 ----
$slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
$currentRoomType = $dbSessionVars['roomType'];
! $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
require('./lib/check_and_kick_user.lib.' . C_EXTENSION);
pmcCheckAndKickUser(true);
***************
*** 111,115 ****
. '(type = 1'
. (($dbSessionVars['roomType'] == 0)
! ? ' OR (type = 0 AND room = \'' . $dbSessionVars['targetRoom'] .'\')) '
: ') ')
. 'ORDER BY m_time DESC '
--- 111,115 ----
. '(type = 1'
. (($dbSessionVars['roomType'] == 0)
! ? ' OR (type = 0 AND room = \'' . $dbSessionVars['currentRoom'] .'\')) '
: ') ')
. 'ORDER BY m_time DESC '
***************
*** 145,151 ****
if ($ignoredSendersList != '')
$ignoredSendersList = 'username NOT IN (' . $ignoredSendersList . ') AND ';
-
- $slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
- $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['targetRoom']);
$getMessagesQuery = 'SELECT username, latin1, m_time, address, color, msg_' . $dbSessionVars['msgKind'] . ' '
--- 145,148 ----
Index: input.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/input.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** input.php3 2001/04/05 00:42:22 1.3
--- input.php3 2001/04/08 18:24:04 1.4
***************
*** 85,89 ****
$slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
$currentRoomType = $dbSessionVars['roomType'];
! $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['targetRoom']);
require('./lib/check_and_kick_user.lib.' . C_EXTENSION);
pmcCheckAndKickUser(false);
--- 85,89 ----
$slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
$currentRoomType = $dbSessionVars['roomType'];
! $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
require('./lib/check_and_kick_user.lib.' . C_EXTENSION);
pmcCheckAndKickUser(false);
Index: handle_input.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/handle_input.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** handle_input.php3 2001/04/04 23:50:54 1.2
--- handle_input.php3 2001/04/08 18:24:04 1.3
***************
*** 86,90 ****
$slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
$currentRoomType = $dbSessionVars['roomType'];
! $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['targetRoom']);
require('./lib/check_and_kick_user.lib.' . C_EXTENSION);
pmcCheckAndKickUser(false);
--- 86,90 ----
$slashedNick = pmcSlashSingleQuotes($dbSessionVars['nick']);
$currentRoomType = $dbSessionVars['roomType'];
! $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
require('./lib/check_and_kick_user.lib.' . C_EXTENSION);
pmcCheckAndKickUser(false);
|