Menu
▾
▴
[phpMyChat CVS] CVS: phpMyChat - 0.14/chat usersL.php3,1.4,1.5 usersH.php3,1.10,1.11
|
From: Lo?c C. <lo...@us...> - 2001-04-21 14:51:27
|
Update of /cvsroot/phpmychat/phpMyChat - 0.14/chat
In directory usw-pr-cvs1:/tmp/cvs-serv25912/chat
Modified Files:
usersL.php3 usersH.php3
Log Message:
Improve db queries
***** Bogus filespec: -
***** Bogus filespec: 0.14/chat
Index: usersL.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat - 0.14/chat/usersL.php3,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** usersL.php3 2001/04/11 21:04:46 1.4
--- usersL.php3 2001/04/21 14:51:23 1.5
***************
*** 78,82 ****
. 'WHERE usr.room = \'' . $R . '\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, NULL '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $R . '\' '
--- 78,82 ----
. 'WHERE usr.room = \'' . $R . '\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $R . '\' '
***************
*** 85,89 ****
else
{
! $currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'' . $R . '\' '
--- 85,89 ----
else
{
! $currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'' . $R . '\' '
***************
*** 149,153 ****
. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, 0 '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . addslashes($Other) . '\' '
--- 149,153 ----
. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . addslashes($Other) . '\' '
***************
*** 156,160 ****
else
{
! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, 0 '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
--- 156,160 ----
else
{
! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
Index: usersH.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat - 0.14/chat/usersH.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** usersH.php3 2001/04/11 21:04:46 1.10
--- usersH.php3 2001/04/21 14:51:23 1.11
***************
*** 101,105 ****
. 'WHERE usr.room = \'' . $R . '\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, NULL '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $R . '\' '
--- 101,105 ----
. 'WHERE usr.room = \'' . $R . '\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $R . '\' '
***************
*** 108,112 ****
else
{
! $currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'' . $R . '\' '
--- 108,112 ----
else
{
! $currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'' . $R . '\' '
***************
*** 172,176 ****
. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, 0 '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . addslashes($Other) . '\' '
--- 172,176 ----
. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . addslashes($Other) . '\' '
***************
*** 179,183 ****
else
{
! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, 0 '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
--- 179,183 ----
else
{
! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
***************
*** 191,195 ****
$id = md5($Other);
if ($i == 1) $FirstOtherRoom = "Parent".$id;
! echo("<DIV ID=\"Parent${id}\" CLASS=\"parent\" STYLE=\"margin-top: 5px; CURSOR: hand\">");
echo("<A HREF=\"#\" onClick=\"window.parent.expandIt('${id}'); return false\">");
echo("<IMG NAME=\"imEx\" SRC=\"images/closed.gif\" WIDTH=9 HEIGHT=9 BORDER=0 ALT=\"".L_EXPCOL."\"></A>");
--- 191,195 ----
$id = md5($Other);
if ($i == 1) $FirstOtherRoom = "Parent".$id;
! echo("<DIV ID=\"Parent${id}\" CLASS=\"parent\" STYLE=\"margin-top: 10px; CURSOR: hand\">");
echo("<A HREF=\"#\" onClick=\"window.parent.expandIt('${id}'); return false\">");
echo("<IMG NAME=\"imEx\" SRC=\"images/closed.gif\" WIDTH=9 HEIGHT=9 BORDER=0 ALT=\"".L_EXPCOL."\"></A>");
***************
*** 241,245 ****
$FirstOtherRoom = "Parent".$id;
! echo("<DIV ID=\"Parent${id}\" CLASS=\"parent\" STYLE=\"margin-top: 5px; CURSOR: hand\">");
echo("<A HREF=\"$From?Ver=H&L=$L&U=".urlencode(stripslashes($U))."$AddPwd2Link&R0=".urlencode($tmpRoom)."&T=1&D=$D&N=$N&E=".urlencode(stripslashes($R))."&EN=$T\" TARGET=\"_parent\">".htmlspecialchars($tmpRoom)."</A><SPAN CLASS=\"small\"><BDO dir=\"${textDirection}\"></BDO> (0)</SPAN>");
echo("</DIV>\n");
--- 241,245 ----
$FirstOtherRoom = "Parent".$id;
! echo("<DIV ID=\"Parent${id}\" CLASS=\"parent\" STYLE=\"margin-top: 10px; CURSOR: hand\">");
echo("<A HREF=\"$From?Ver=H&L=$L&U=".urlencode(stripslashes($U))."$AddPwd2Link&R0=".urlencode($tmpRoom)."&T=1&D=$D&N=$N&E=".urlencode(stripslashes($R))."&EN=$T\" TARGET=\"_parent\">".htmlspecialchars($tmpRoom)."</A><SPAN CLASS=\"small\"><BDO dir=\"${textDirection}\"></BDO> (0)</SPAN>");
echo("</DIV>\n");
|
