[phpMyChat CVS] CVS: phpMyChat - 0.14/chat usersL.php3,1.5,1.6 usersH.php3,1.11,1.12 users_popupL.php3,1.3,1.4 users_popupH.php3,1.3,1.4

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

Update of /cvsroot/phpmychat/phpMyChat - 0.14/chat
In directory usw-pr-cvs1:/tmp/cvs-serv19598/chat

Modified Files:
	usersL.php3 usersH.php3 users_popupL.php3 users_popupH.php3 
Log Message:
Some SQL optimizations

***** Bogus filespec: -
***** Bogus filespec: 0.14/chat
Index: usersL.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat - 0.14/chat/usersL.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** usersL.php3	2001/04/21 14:51:23	1.5
--- usersL.php3	2001/04/22 11:29:40	1.6
***************
*** 70,74 ****
  						. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
  						. 'WHERE usr.room = \'' . $R . '\' '
! 						. 'ORDER BY usr.username';
  }
  else if (C_DB_TYPE == 'pgsql')
--- 70,74 ----
  						. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
  						. 'WHERE usr.room = \'' . $R . '\' '
! 						. 'ORDER BY username';
  }
  else if (C_DB_TYPE == 'pgsql')
***************
*** 81,85 ****
  						. 'FROM ' . C_USR_TBL . ' usr '
  						. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $R . '\' '
! 						. 'ORDER BY usr.username';
  }
  else
--- 81,85 ----
  						. 'FROM ' . C_USR_TBL . ' usr '
  						. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $R . '\' '
! 						. 'ORDER BY username';
  }
  else
***************
*** 88,92 ****
  						. 'FROM ' . C_USR_TBL . ' usr '
  						. 'WHERE usr.room = \'' . $R . '\' '
! 						. 'ORDER BY usr.username';
  }
  
--- 88,92 ----
  						. 'FROM ' . C_USR_TBL . ' usr '
  						. 'WHERE usr.room = \'' . $R . '\' '
! 						. 'ORDER BY username';
  }
  
***************
*** 141,145 ****
  								. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
  								. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
! 								. 'ORDER BY usr.username';
  		}
  		else if (C_DB_TYPE == 'pgsql')
--- 141,145 ----
  								. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
  								. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
! 								. 'ORDER BY username';
  		}
  		else if (C_DB_TYPE == 'pgsql')
***************
*** 152,156 ****
  								. 'FROM ' . C_USR_TBL . ' usr '
  								. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . addslashes($Other) . '\' '
! 								. 'ORDER BY usr.username';
  		}
  		else
--- 152,156 ----
  								. 'FROM ' . C_USR_TBL . ' usr '
  								. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . addslashes($Other) . '\' '
! 								. 'ORDER BY username';
  		}
  		else
***************
*** 159,163 ****
  								. 'FROM ' . C_USR_TBL . ' usr '
  								. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
! 								. 'ORDER BY usr.username';
  		}
  
--- 159,163 ----
  								. 'FROM ' . C_USR_TBL . ' usr '
  								. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
! 								. 'ORDER BY username';
  		}
  

Index: usersH.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat - 0.14/chat/usersH.php3,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** usersH.php3	2001/04/21 14:51:23	1.11
--- usersH.php3	2001/04/22 11:29:40	1.12
***************
*** 93,97 ****
  						. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
  						. 'WHERE usr.room = \'' . $R . '\' '
! 						. 'ORDER BY usr.username';
  }
  else if (C_DB_TYPE == 'pgsql')
--- 93,97 ----
  						. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
  						. 'WHERE usr.room = \'' . $R . '\' '
! 						. 'ORDER BY username';
  }
  else if (C_DB_TYPE == 'pgsql')
***************
*** 104,108 ****
  						. 'FROM ' . C_USR_TBL . ' usr '
  						. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $R . '\' '
! 						. 'ORDER BY usr.username';
  }
  else
--- 104,108 ----
  						. 'FROM ' . C_USR_TBL . ' usr '
  						. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $R . '\' '
! 						. 'ORDER BY username';
  }
  else
***************
*** 111,115 ****
  						. 'FROM ' . C_USR_TBL . ' usr '
  						. 'WHERE usr.room = \'' . $R . '\' '
! 						. 'ORDER BY usr.username';
  }
  
--- 111,115 ----
  						. 'FROM ' . C_USR_TBL . ' usr '
  						. 'WHERE usr.room = \'' . $R . '\' '
! 						. 'ORDER BY username';
  }
  
***************
*** 164,168 ****
  								. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
  								. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
! 								. 'ORDER BY usr.username';
  		}
  		else if (C_DB_TYPE == 'pgsql')
--- 164,168 ----
  								. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
  								. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
! 								. 'ORDER BY username';
  		}
  		else if (C_DB_TYPE == 'pgsql')
***************
*** 175,179 ****
  								. 'FROM ' . C_USR_TBL . ' usr '
  								. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . addslashes($Other) . '\' '
! 								. 'ORDER BY usr.username';
  		}
  		else
--- 175,179 ----
  								. 'FROM ' . C_USR_TBL . ' usr '
  								. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . addslashes($Other) . '\' '
! 								. 'ORDER BY username';
  		}
  		else
***************
*** 182,186 ****
  								. 'FROM ' . C_USR_TBL . ' usr '
  								. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
! 								. 'ORDER BY usr.username';
  		}
  
--- 182,186 ----
  								. 'FROM ' . C_USR_TBL . ' usr '
  								. 'WHERE usr.room = \'' . addslashes($Other) . '\' '
! 								. 'ORDER BY username';
  		}
  

Index: users_popupL.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat - 0.14/chat/users_popupL.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** users_popupL.php3	2001/03/23 18:44:46	1.3
--- users_popupL.php3	2001/04/22 11:29:40	1.4
***************
*** 88,92 ****
  {
  	// ** count users **
! 	$DbLink->query("SELECT DISTINCT u.username, u.latin1 FROM ".C_USR_TBL." u, ".C_MSG_TBL." m WHERE u.room = m.room AND m.type = 1 ORDER BY u.username");
  	$NbUsers = $DbLink->num_rows();
  	if($NbUsers > 3)
--- 88,92 ----
  {
  	// ** count users **
! 	$DbLink->query("SELECT DISTINCT u.username, u.latin1 FROM ".C_USR_TBL." u, ".C_MSG_TBL." m WHERE u.room = m.room AND m.type = 1 ORDER BY username");
  	$NbUsers = $DbLink->num_rows();
  	if($NbUsers > 3)

Index: users_popupH.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat - 0.14/chat/users_popupH.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** users_popupH.php3	2001/03/23 18:44:46	1.3
--- users_popupH.php3	2001/04/22 11:29:40	1.4
***************
*** 88,92 ****
  {
  	// ** count users **
! 	$DbLink->query("SELECT DISTINCT u.username, u.latin1 FROM ".C_USR_TBL." u, ".C_MSG_TBL." m WHERE u.room = m.room AND m.type = 1 ORDER BY u.username");
  	$NbUsers = $DbLink->num_rows();
  	if($NbUsers > 3)
--- 88,92 ----
  {
  	// ** count users **
! 	$DbLink->query("SELECT DISTINCT u.username, u.latin1 FROM ".C_USR_TBL." u, ".C_MSG_TBL." m WHERE u.room = m.room AND m.type = 1 ORDER BY username");
  	$NbUsers = $DbLink->num_rows();
  	if($NbUsers > 3)