phpmychat-cvs-commited Mailing List for phpMyChat (Page 17)

Standalone chat system developed in php, mysql and javascript

Brought to you by: ciprianmp, nhoizey

phpmychat-cvs-commited — All the commits of the cvs code repository are posted to this list automatically

You can subscribe to this list here.

2001	_Jan	_Feb	_Mar (51)	_Apr (688)	_May (260)	_Jun (108)	_Jul (42)	_Aug	_Sep (2)	_Oct	_Nov (74)	_Dec (217)
2002	_Jan	_Feb	_Mar	_Apr (4)	_May (3)	_Jun (6)	_Jul (2)	_Aug	_Sep	_Oct	_Nov (2)	_Dec
2003	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul (1)	_Aug	_Sep	_Oct	_Nov	_Dec
2004	_Jan	_Feb	_Mar	_Apr (1)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2005	_Jan	_Feb (8)	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (1)	_Nov	_Dec

Flat | Threaded

<< < 1 .. 15 16 17 18 19 .. 59 > >> (Page 17 of 59)

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/lib connected_users.lib.php3,1.2,1.3

From: Lo?c C. <lo...@us...> - 2001-06-10 15:15:19

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

Modified Files:
	connected_users.lib.php3 
Log Message:
Too many changes to detail.

Index: connected_users.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/connected_users.lib.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** connected_users.lib.php3	2001/05/31 20:10:31	1.2
--- connected_users.lib.php3	2001/06/10 15:15:17	1.3
***************
*** 68,76 ****
  		if ($isFullList)
  		{
! 			$query	= 'SELECT u.username AS nicks, u.latin1 FROM ' . C_USR_TBL . ' u, ' . C_MSG_TBL . ' m WHERE u.room = m.room AND m.type = 1 GROUP BY nicks';
  		}
  		else
  		{
! 			$query	= 'SELECT COUNT(*) FROM ' . C_USR_TBL . ' u, ' . C_MSG_TBL . ' m WHERE u.room = m.room AND m.type = 1';
  		}
  	}
--- 68,76 ----
  		if ($isFullList)
  		{
! 			$query	= 'SELECT u.username AS nicks, u.latin1 FROM ' . C_USR_TBL . ' u, ' . C_ROOM_TBL . ' r WHERE u.room = r.room_name AND r.room_type = 1 GROUP BY nicks';
  		}
  		else
  		{
! 			$query	= 'SELECT COUNT(*) FROM ' . C_USR_TBL . ' u, ' . C_ROOM_TBL . ' r WHERE u.room = r.room_name AND r.room_type = 1';
  		}
  	}

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/config style.css.php3,1.5,1.6

From: Lo?c C. <lo...@us...> - 2001-06-10 15:14:58

Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/config
In directory usw-pr-cvs1:/tmp/cvs-serv20802/chat/config

Modified Files:
	style.css.php3 
Log Message:
Removed textarea selector

Index: style.css.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/config/style.css.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** style.css.php3	2001/04/30 22:45:48	1.5
--- style.css.php3	2001/06/10 15:14:54	1.6
***************
*** 136,140 ****
  }
  
! input, select, textarea
  {
  	background: #EEEEFF;
--- 136,140 ----
  }
  
! input, select
  {
  	background: #EEEEFF;

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/admin admin1.php3,1.3,1.4 admin2.php3,1.4,1.5 admin3.php3,1.4,1.5 admin4.php3,1.3,1.4 admin_body.php3,1.3,1.4 admin_top.php3,1.2,1.3

From: Lo?c C. <lo...@us...> - 2001-06-10 14:59:16

Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/admin
In directory usw-pr-cvs1:/tmp/cvs-serv18029/chat/admin

Modified Files:
	admin1.php3 admin2.php3 admin3.php3 admin4.php3 
	admin_body.php3 admin_top.php3 
Log Message:
Updated with the new table structure but just a first draft

Index: admin1.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/admin/admin1.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** admin1.php3	2001/05/30 08:07:13	1.3
--- admin1.php3	2001/06/10 14:59:13	1.4
***************
*** 43,46 ****
--- 43,48 ----
   * is currently chatting
   *
+  * @param	string	wheter the right levels table has to be cleaned or not
+  *
   * @global	string	the nick of the user to remove
   * @global	object	the pmcDB instance to use
***************
*** 48,52 ****
   * @access	private
   */
! function delProfile()
  {
  	global $username;
--- 50,54 ----
   * @access	private
   */
! function delProfile($doDelRights = '')
  {
  	global $username;
***************
*** 58,80 ****
  
  	$dbLink->query("DELETE FROM " . C_REG_TBL . " WHERE username = '$slashedUsername'");
  	$dbLink->query("SELECT room FROM " . C_USR_TBL . " WHERE username = '$slashedUsername' LIMIT 1");
  	$isChatting = (list($room) = $dbLink->nextRecord());
  
  	// Sends a message to the user if he is currently chatting
  	if ($isChatting)
  	{
! 		$room = pmcHandleMagicQuotes($room, '', '1', 'del');
! 		$dbLink->cleanResults();
! 		// Gets the type of the room (public/private) where the message has to be sent
! 		$slashedTargetRoom	= pmcSlashSingleQuotes($room);
! 		$dbLink->query("SELECT type FROM " . C_MSG_TBL . " WHERE room = '$slashedTargetRoom' LIMIT 1");
! 		list($targetRoomType) = $dbLink->nextRecord();
! 		$dbLink->cleanResults();
  		$dbLink->query("UPDATE " . C_USR_TBL . " SET status = 'u' WHERE username = '$slashedUsername'");
! 		$aQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
! 				. 'VALUES ('
! 				. "$targetRoomType, '$slashedTargetRoom', 'SYS delreg', '', " . time() . ", '$slashedUsername', '#666699', 'sprintf(L_ADM_2)', 'sprintf(L_ADM_2)'"
! 				. ')';
  		$dbLink->query($aQuery);
  	}
--- 60,83 ----
  
  	$dbLink->query("DELETE FROM " . C_REG_TBL . " WHERE username = '$slashedUsername'");
+ 	if (!empty($doDelRights))
+ 	{
+ 		$dbLink->query("DELETE FROM " . C_RIGHT_TBL . " WHERE username = '$slashedUsername'");
+ 	}
  	$dbLink->query("SELECT room FROM " . C_USR_TBL . " WHERE username = '$slashedUsername' LIMIT 1");
  	$isChatting = (list($room) = $dbLink->nextRecord());
+ 	$dbLink->cleanResults();
  
  	// Sends a message to the user if he is currently chatting
  	if ($isChatting)
  	{
! 		$theTime			= time();
! 		$slashedTargetRoom	= pmcSlashSingleQuotes(pmcHandleMagicQuotes($room, '', '1', 'del'));
  		$dbLink->query("UPDATE " . C_USR_TBL . " SET status = 'u' WHERE username = '$slashedUsername'");
! 		$dbLink->query("UPDATE " . C_ROOM_TBL . " SET last_user_modif = $theTime WHERE room_name = '$slashedTargetRoom'");
! 		$aQuery				= 'INSERT INTO ' . C_MSG_TBL . ' '
! 							. '(room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
! 							. 'VALUES ('
! 							. "'$slashedTargetRoom', 'SYS delreg', '', $theTime, '$slashedUsername', '#666699', 'sprintf(L_ADM_2)', 'sprintf(L_ADM_2)'"
! 							. ')';
  		$dbLink->query($aQuery);
  	}
***************
*** 100,107 ****
  
  	// Gets some additional values from the registered users table
! 	$dbLink->query("SELECT latin1, ip FROM " . C_REG_TBL . " WHERE username = '$slashedUsername' LIMIT 1");
! 	list($latin1, $ip) = $dbLink->nextRecord();
  	$dbLink->cleanResults();
  
  	// Ensure the user isn't already banished before doing the work
  	$dbLink->query("SELECT count(*) FROM " . C_BAN_TBL . " WHERE username = '$slashedUsername' LIMIT 1");
--- 103,112 ----
  
  	// Gets some additional values from the registered users table
! 	$dbLink->query("SELECT charset, ip FROM " . C_REG_TBL . " WHERE username = '$slashedUsername' LIMIT 1");
! 	list($theUsrCharset, $theIp)	= $dbLink->nextRecord();
  	$dbLink->cleanResults();
+ 	$isLatin1						= ($theUsrCharset == 'iso-8859-1') ? 1 : 0;
  
+ 
  	// Ensure the user isn't already banished before doing the work
  	$dbLink->query("SELECT count(*) FROM " . C_BAN_TBL . " WHERE username = '$slashedUsername' LIMIT 1");
***************
*** 113,117 ****
  		if ($banUntil > 2147483647)
  			$banUntil = 2147483647;
! 		$dbLink->query("INSERT INTO " . C_BAN_TBL . " (username, latin1, ip, rooms, ban_until) VALUES ('$slashedUsername', $latin1, '$ip', '**to define**', $banUntil)");
  	}
  }  // end of the 'banProfile()' function
--- 118,122 ----
  		if ($banUntil > 2147483647)
  			$banUntil = 2147483647;
! 		$dbLink->query("INSERT INTO " . C_BAN_TBL . " (username, latin1, ip, rooms, ban_until) VALUES ('$slashedUsername', $isLatin1, '$theIp', '**to define**', $banUntil)");
  	}
  }  // end of the 'banProfile()' function
***************
*** 144,148 ****
  
  	// Updates perms level
! 	$dbLink->query("UPDATE " . C_REG_TBL . " SET perms = '$newPermLevel', rooms = '" . pmcSlashSingleQuotes($newModeratedRooms) . "' WHERE username = '$slashedUsername'");
  
  	// Checks if the user should be sent a message
--- 149,162 ----
  
  	// Updates perms level
! 	$modRooms		= explode(',', $newModeratedRooms);
! 	$modRoomsCnt	= count($modRooms);
! 	$dbLink->query("DELETE FROM " . C_RIGHT_TBL . " WHERE username = '$slashedUsername'");
! 	for ($i = 0; $i < $modRoomsCnt; $i++)
! 	{
! 		if (!empty($modRooms[$i]))
! 		{
! 			$dbLink->query("INSERT INTO " . C_RIGHT_TBL . " (username, room, right_level) VALUES ('$slashedUsername', '" . pmcSlashSingleQuotes($modRooms[$i]) . "', 5)");
! 		}
! 	}
  
  	// Checks if the user should be sent a message
***************
*** 233,248 ****
  		}
  
! 		// Udpates the user status for the room he is chatting into
  		$dbLink->query("UPDATE " . C_USR_TBL . " SET status = '$status' WHERE username = '$slashedUsername'");
! 		// Gets the type of the room
  		$slashedTargetRoom	= pmcSlashSingleQuotes($room);
! 		$dbLink->query("SELECT type FROM " . C_MSG_TBL . " WHERE room = '$slashedTargetRoom' LIMIT 1");
! 		list($targetRoomType) = $dbLink->nextRecord();
! 		$dbLink->cleanResults();
! 		// Inserts the message into the messages table
  		$aQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  				. 'VALUES ('
! 				. "$targetRoomType, '$slashedTargetRoom', 'SYS promote', '', " . time() . ", NULL, '#666699', '$message', '$message'"
  				. ')';
  		$dbLink->query($aQuery);
--- 247,259 ----
  		}
  
! 		// Udpates the tables
  		$dbLink->query("UPDATE " . C_USR_TBL . " SET status = '$status' WHERE username = '$slashedUsername'");
! 		$theTime			= time();
  		$slashedTargetRoom	= pmcSlashSingleQuotes($room);
! 		$dbLink->query("UPDATE " . C_ROOM_TBL . " SET last_user_modif = $theTime WHERE room_name = '$slashedTargetRoom'");
  		$aQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  				. 'VALUES ('
! 				. "'$slashedTargetRoom', 'SYS promote', '', " . time() . ", NULL, '#666699', '$message', '$message'"
  				. ')';
  		$dbLink->query($aQuery);
***************
*** 260,263 ****
--- 271,275 ----
   * @see	delProfile(), banProfile(), modifyPerms()
   */
+ $slashedAdminNick = pmcSlashSingleQuotes($dbSessionVars['authUsername']);
  if (!empty($submitType))
  {
***************
*** 282,286 ****
  		$queryLimits = '';
  	}
! 	$dbLink->query("SELECT username FROM " . C_REG_TBL . " WHERE perms != 'admin' ORDER BY " . $dbSessionVars['sortBy'] . " " . $dbSessionVars['sortOrder'] . $queryLimits);
  	$regUsers = array();
  	while (list($username) = $dbLink->nextRecord())
--- 294,298 ----
  		$queryLimits = '';
  	}
! 	$dbLink->query("SELECT username FROM " . C_REG_TBL . " WHERE username != '$slashedAdminNick'" . $queryLimits);
  	$regUsers = array();
  	while (list($username) = $dbLink->nextRecord())
***************
*** 303,312 ****
  		if ($deleteMode)
  		{
! 			$varName = 'selected_' . $encodedUsername;
  			if (isset($$varName))
! 				delProfile();
! 
! 			// Optimize the registered users table when a MySQL DB is used
  			$dbLink->optimize(C_REG_TBL);
  		} // end of the case where some profiles have to been deleted
  
--- 315,327 ----
  		if ($deleteMode)
  		{
! 			$varName	= 'selected_' . $encodedUsername;
! 			$permsLevel	= 'old_perms_' . $encodedUsername;
  			if (isset($$varName))
! 			{
! 				delProfile($$permsLevel);
! 			}
! 			// Optimize the registered users table
  			$dbLink->optimize(C_REG_TBL);
+ 			$dbLink->optimize(C_RIGHT_TBL);
  		} // end of the case where some profiles have to been deleted
  
***************
*** 334,339 ****
  			$oldModeratedRooms	= pmcHandleMagicQuotes($$varName, 1, '', 'del');
  			if ($newPermLevel == $oldPermLevel && $newModeratedRooms == $oldModeratedRooms)
  				continue;	// No changes for this user
! 
  			modifyPerms();
  		}	// end of the case where some permission levels have to been modified
--- 349,355 ----
  			$oldModeratedRooms	= pmcHandleMagicQuotes($$varName, 1, '', 'del');
  			if ($newPermLevel == $oldPermLevel && $newModeratedRooms == $oldModeratedRooms)
+ 			{
  				continue;	// No changes for this user
! 			}
  			modifyPerms();
  		}	// end of the case where some permission levels have to been modified
***************
*** 345,358 ****
  /**
   * Cleans the registered users table
   */
  // Removes profiles of users that have not been chatting for a time > C_REG_DEL
  if (!isset($submitType) && C_REG_DEL != 0)
! 	$dbLink->query("DELETE FROM " . C_REG_TBL . " WHERE reg_time < " . (time() - C_REG_DEL * 60 * 60 * 24) . " AND perms != 'admin'");
  
- // Removes moderator status when there is no room associated to
- $dbLink->query("UPDATE " . C_REG_TBL . " SET perms = 'user' WHERE perms = 'moderator' AND rooms = ''");
  
  
  
  /**
   * Displays the registered users sheet
--- 361,504 ----
  /**
   * Cleans the registered users table
+  *
+  * The 'pmcSlashSingleQuotes()' and 'pmcHandleMagicQuotes()' functions are
+  * defined inside the 'chat/lib/common.lib.php3' library
   */
  // Removes profiles of users that have not been chatting for a time > C_REG_DEL
  if (!isset($submitType) && C_REG_DEL != 0)
! {
! 	$delBefore = time() - C_REG_DEL * 60 * 60 * 24;
! 	$dbLink->query("SELECT username FROM " . C_REG_TBL . " WHERE reg_time < $delBefore AND username != '$slashedAdminNick'");
! 	while (list($username) = $dbLink->nextRecord())
! 	{
! 		$username			= pmcSlashSingleQuotes(pmcHandleMagicQuotes($username, '', 1, 'del'));
! 		$toDelRegUsersQuery = (isset($toDelRegUsersQuery))
! 							? $toDelRegUsersQuery . ', \'' . $username . '\''
! 							: '\'' . $username . '\'';
! 	}
! 	$dbLink->query("DELETE FROM " . C_REG_TBL . " WHERE reg_time < $delBefore AND username != '$slashedAdminNick'");
! 	$dbLink->query("DELETE FROM " . C_RIGHT_TBL . " WHERE username IN ($toDelRegUsersQuery)");
! }
  
  
  
+ /**
+  * Prepares the registered users list to be displayed
+  *
+  * The 'pmcSlashSingleQuotes()' and 'pmcHandleMagicQuotes()' functions are
+  * defined inside the 'chat/lib/common.lib.php3' library
+  */
+ // Get the number of registered users
+ $dbLink->query("SELECT COUNT(*) FROM " . C_REG_TBL . " WHERE username != '$slashedAdminNick' LIMIT 1");
+ list($regUsersCnt) = $dbLink->nextRecord();
+ $dbLink->cleanResults();
+ if ($regUsersCnt != 0)
+ {
+ 	// Defines wich profiles have to been displayed 
+ 	$lastPageOffset = floor(($regUsersCnt - 1) / 10) * 10;
+ 	if ($dbSessionVars['offset'] > $lastPageOffset)
+ 		$dbSessionVars['offset'] = $lastPageOffset;
+ 	if (C_DB_TYPE == 'mysql')
+ 	{
+ 		$queryLimits	= ' LIMIT ' . $dbSessionVars['offset'] . ',10';
+ 	}
+ 	else if (C_DB_TYPE == 'pgsql')
+ 	{
+ 		$queryLimits	= ' LIMIT 10 OFFSET ' . $dbSessionVars['offset'];
+ 	}
+ 	else // TODO
+ 	{
+ 		$queryLimits	= '';
+ 	}
+ 	// Define the sorting clause
+ 	$querySort			= ($dbSessionVars['sortBy'] != 'perms')
+ 						? ' ORDER BY ' . $dbSessionVars['sortBy'] . ' ' . $dbSessionVars['sortOrder']
+ 						: '';
  
+ 	// Gets these profiles
+ 	$regUsersList	= array();
+ 	$dbLink->query("SELECT username, charset, reg_time, ip FROM " . C_REG_TBL . " WHERE username != '$slashedAdminNick'" . $querySort . $queryLimits);
+ 	while (list($username, $usrCharset, $lastLog, $ip) = $dbLink->nextRecord())
+ 	{
+ 		$username					= pmcHandleMagicQuotes($username, '', 1, 'del');
+ 		$latin1						= ($usrCharset == 'iso-8859-1') ? 1 : 0;
+ 		$regUsersList[$username]	= array($username, $latin1, $lastLog, $ip, '', '');
+ 		$regUsersPermsQuery 		= (isset($regUsersPermsQuery))
+ 									? $regUsersPermsQuery . ', \'' . pmcSlashSingleQuotes($username) . '\''
+ 									: '\'' . pmcSlashSingleQuotes($username) . '\'';
+ 	}
+ 	$dbLink->cleanResults();
+ 
+ 	// Get the right levels
+ 	$dbLink->query("SELECT username, room, right_level FROM " . C_RIGHT_TBL . " WHERE username IN ($regUsersPermsQuery) ORDER BY username");
+ 	while (list($username, $moderatedRoom, $perms) = $dbLink->nextRecord())
+ 	{
+ 		$username		= pmcHandleMagicQuotes($username, '', 1, 'del');
+ 		$moderatedRoom	= pmcHandleMagicQuotes($moderatedRoom, '', 1, 'del');
+ 
+ 		// New user starts here -> save data for the previous one
+ 		if ((isset($handledNick) && $handledNick != $username)
+ 			&& !empty($moderatedRoomsList))
+ 		{
+ 			$regUsersList[$handledNick][5]	= $moderatedRoomsList;
+ 			$handledNick					= $username;
+ 			unset($moderatedRoomsList);
+ 		}
+ 		// First iteration -> define the handled nick
+ 		else if (empty($handledNick))
+ 		{
+ 			$handledNick					= $username;
+ 		}
+ 
+ 		// Define the list of moderated rooms splitted by a comma
+ 		if (!empty($moderatedRoom))
+ 		{
+ 			$moderatedRoomsList				= (isset($moderatedRoomsList))
+ 											? $moderatedRoomsList . ',' . $moderatedRoom
+ 											: $moderatedRoom;
+ 			if (empty($regUsersList[$username][4]))
+ 			{
+ 				$regUsersList[$username][4]	= $perms;
+ 			}
+ 		}
+ 	}
+ 	// For the last moderator
+ 	if (!empty($moderatedRoomsList))
+ 	{
+ 		$regUsersList[$handledNick][5]		= $moderatedRoomsList;
+ 	}
+ 	$dbLink->cleanResults();
+ 
+ 	// Sort by right level if required
+ 	if ($dbSessionVars['sortBy'] == 'perms')
+ 	{
+ 		/**
+ 		 * Home build comparaison function used to sort registered users by
+ 		 * right level
+ 		 *
+ 		 * @param	array	data related to one user
+ 		 * @param	array	data related to an other user
+ 		 */
+ 		function permsCmp($a, $b)
+ 		{
+ 		    if ($a[4] == $b[4])
+ 			{
+ 				return strcasecmp($a[0], $b[0]);
+ 			}
+ 			else if ($GLOBALS['dbSessionVars']['sortOrder'] == 'ASC')
+ 			{
+     			return (empty($a[4])) ? -1 : 1;
+ 			}
+ 			else
+ 			{
+     			return (empty($a[4])) ? 1 : -1;
+ 			}
+ 		} // end of the 'permsCmp()' function
+ 
+ 		uasort($regUsersList, 'permsCmp');
+ 	} // end of sorting by right level
+ } // end of preparing the list of registered users
+ 
+ 
  /**
   * Displays the registered users sheet
***************
*** 386,395 ****
  <?php
  
! // Ensures at least one registered user exists (except the administrator)
! // before displaying the sheet
! $dbLink->query("SELECT COUNT(*) FROM " . C_REG_TBL . " WHERE perms != 'admin' LIMIT 1");
! list($regUsersCnt) = $dbLink->nextRecord();
! $dbLink->cleanResults();
! if ($regUsersCnt != 0)
  {
  	echo("\n");
--- 532,537 ----
  <?php
  
! // At least one registered user exists (except the administrator)
! if (isset($regUsersList))
  {
  	echo("\n");
***************
*** 420,448 ****
  				</td>
  			</tr>
- 	<?php
- 	
- 	// Defines wich profiles have to been displayed 
- 	$lastPageOffset = floor(($regUsersCnt - 1) / 10) * 10;
- 	if ($dbSessionVars['offset'] > $lastPageOffset)
- 		$dbSessionVars['offset'] = $lastPageOffset;
- 	if (C_DB_TYPE == 'mysql')
- 	{
- 		$queryLimits = ' LIMIT ' . $dbSessionVars['offset'] . ',10';
- 	}
- 	else if (C_DB_TYPE == 'pgsql')
- 	{
- 		$queryLimits = ' LIMIT 10 OFFSET ' . $dbSessionVars['offset'];
- 	}
- 	else
- 	{
- 		$queryLimits = '';
- 	}
  
! 	// Gets these profiles
! 	$dbLink->query("SELECT username, latin1, perms, rooms, reg_time, ip FROM " . C_REG_TBL . " WHERE perms != 'admin' ORDER BY " . $dbSessionVars['sortBy'] . " " . $dbSessionVars['sortOrder'] . $queryLimits);
! 	while (list($username, $latin1, $perms, $rooms, $lastLog, $ip) = $dbLink->nextRecord())
! 	{
! 		$username	= pmcHandleMagicQuotes($username, '', 1, 'del');
! 		$rooms		= pmcHandleMagicQuotes($rooms, '', 1, 'del');
  		echo("\n");
  		?>
--- 562,577 ----
  				</td>
  			</tr>
  
! 	<?php
! 	// Displays the profiles
! 	reset($regUsersList);
! 	while (list($key, $value) = each($regUsersList))
! 	{
! 		$username	= $value[0];
! 		$latin1		= $value[1];
! 		$lastLog	= $value[2];
! 		$ip			= $value[3];
! 		$perms		= $value[4];
! 		$rooms		= $value[5];
  		echo("\n");
  		?>
***************
*** 463,468 ****
  				<td valign="middle" align="center">
  					<select name="perms_<?php echo(urlencode($username)); ?>">
! 						<option value="user"<?php if ($perms == 'user') echo(' selected="selected"'); ?>><?php echo(A_USER); ?></option>
! 						<option value="moderator"<?php if ($perms == 'moderator') echo(' selected="selected"'); ?>><?php echo(A_MODER); ?></option>
  					</select>
  					<input type="hidden" name="old_perms_<?php echo(urlencode($username)); ?>" value="<?php echo($perms); ?>" />
--- 592,597 ----
  				<td valign="middle" align="center">
  					<select name="perms_<?php echo(urlencode($username)); ?>">
! 						<option value="user"<?php if (empty($perms)) echo(' selected="selected"'); ?>><?php echo(A_USER); ?></option>
! 						<option value="moderator"<?php if ($perms == 5) echo(' selected="selected"'); ?>><?php echo(A_MODER); ?></option>
  					</select>
  					<input type="hidden" name="old_perms_<?php echo(urlencode($username)); ?>" value="<?php echo($perms); ?>" />
***************
*** 476,480 ****
  	} // end of the work to display profiles
  
- 	$dbLink->cleanResults();
  	echo("\n");
  	?>
--- 605,608 ----

Index: admin2.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/admin/admin2.php3,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** admin2.php3	2001/05/30 08:07:13	1.4
--- admin2.php3	2001/06/10 14:59:13	1.5
***************
*** 80,83 ****
--- 80,88 ----
  	$dbLink->query("UPDATE " . C_BAN_TBL . " SET rooms = '" . pmcSlashSingleQuotes($newBanishedRooms) . "'$untilQuery WHERE username = '$slashedUsername'");
  
+ 	// Remove moderator status that the user may had been granted for the
+ 	// rooms he/she is banised from
+ 	$roomQueryPart		= '(\'' . str_replace(',', '\', \'', pmcSlashSingleQuotes($newBanishedRooms)) . '\')';
+ 	$dbLink->query("DELETE FROM " . C_RIGHT_TBL . " WHERE username = '$slashedUsername' AND room IN $roomQueryPart");
+ 
  	// Banish the user if he's currently chatting
  	if ($newBanishedRooms == '*')	// The user is banished from all rooms
***************
*** 170,174 ****
--- 175,185 ----
  			$oldBanishedUntil	= $$varName;
  			if ($newBanishedRooms == $oldBanishedRooms && $newBanishedUntil == $oldBanishedUntil)
+ 			{
  				continue;	// No changes for this user
+ 			}
+ 			else
+ 			{
+ 				$newBanishedRooms	= ereg_replace('^,|,$', '', str_replace(',,', ',', $newBanishedRooms));
+ 			}
  
  			modifyBanishment();

Index: admin3.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/admin/admin3.php3,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** admin3.php3	2001/05/30 08:07:13	1.4
--- admin3.php3	2001/06/10 14:59:13	1.5
***************
*** 74,111 ****
  		&& pmcIsInto($room, $defaultPrivateRooms) == -1)
  	{
! 		$dbLink->query("SELECT username, rooms FROM " . C_REG_TBL . " WHERE perms = 'moderator'");
! 		while (list($moderatorUsername, $moderatedRooms) = $dbLink->nextRecord())
! 		{
! 			$moderatorUsername	= pmcHandleMagicQuotes($moderatorUsername, '', 1, 'del');
! 			$moderatorUsername	= pmcSlashSingleQuotes($moderatorUsername);
! 			$moderatedRooms		= pmcHandleMagicQuotes($moderatedRooms, '', 1, 'del');
! 			$moderatedRooms		= pmcSlashSingleQuotes($moderatedRooms);
! 			$changed			= false;
! 			$rooms				= explode(',', $moderatedRooms);
! 			$roomsCnt			= count($rooms);
! 			reset($rooms);
! 			for ($j = 0; $j < $roomsCnt; $j++)
! 			{
! 				if (strcasecmp($room, $rooms[$j]) == 0)
! 				{
! 					$rooms[$j]	= '';
! 					$changed	= true;
! 					break;
! 				}
! 			}
! 			if ($changed)
! 			{
! 				$moderatedRooms = implode(',', $rooms);
! 				$moderatedRooms = ereg_replace('^,|,$', '', $moderatedRooms);
! 				$moderatedRooms = str_replace(',,', ',', $moderatedRooms);
! 				$dbLink->query("UPDATE " . C_REG_TBL . " SET rooms = '$moderatedRooms' WHERE username = '$moderatorUsername'");
! 			}
! 			unset($rooms);
! 		}
! 		$dbLink->cleanResults();
  	}
  
  	// Clean the room;
  	$dbLink->query("DELETE FROM " . C_USR_TBL . " WHERE room = '$room'");
  	$dbLink->query("DELETE FROM " . C_MSG_TBL . " WHERE room = '$room'");
  }// end ot the function 'cleanRoom()'
--- 74,83 ----
  		&& pmcIsInto($room, $defaultPrivateRooms) == -1)
  	{
! 		$dbLink->query("DELETE FROM " . C_RIGHT_TBL . " WHERE room = '$room'");
  	}
  
  	// Clean the room;
  	$dbLink->query("DELETE FROM " . C_USR_TBL . " WHERE room = '$room'");
+ 	$dbLink->query("DELETE FROM " . C_ROOM_TBL . " WHERE room_name = '$room'");
  	$dbLink->query("DELETE FROM " . C_MSG_TBL . " WHERE room = '$room'");
  }// end ot the function 'cleanRoom()'
***************
*** 125,129 ****
  	}
  
! 	// Optimize the messages table when a MySQL DB is used
  	$dbLink->optimize(C_MSG_TBL);
  
--- 97,102 ----
  	}
  
! 	// Optimize the rooms and the messages table
! 	$dbLink->optimize(C_ROOM_TBL);
  	$dbLink->optimize(C_MSG_TBL);
  

Index: admin4.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/admin/admin4.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** admin4.php3	2001/05/30 08:07:13	1.3
--- admin4.php3	2001/06/10 14:59:13	1.4
***************
*** 66,70 ****
  			$splitted					= explode(' ', $mailTo);
  			$splitted[1]				= pmcHandleMagicQuotes($splitted[1], 1, '', 'del');
! 			$recipient[$splitted[0]]	= array($splitted[1], '');
  			// Send the e-mail
  			$mailHandler->pmmSendEmail(	$recipient,
--- 66,70 ----
  			$splitted					= explode(' ', $mailTo);
  			$splitted[1]				= pmcHandleMagicQuotes($splitted[1], 1, '', 'del');
! 			$recipient[$splitted[0]]	= array($splitted[1], $splitted[2]);
  			// Send the e-mail
  			$mailHandler->pmmSendEmail(	$recipient,
***************
*** 119,126 ****
  else
  {
  
  	// Ensure at least one registered user exists (except the administrator)
  	// before displaying the mail form
! 	$dbLink->query("SELECT COUNT(*) FROM " . C_REG_TBL . " WHERE perms != 'admin' LIMIT 1");
  	list($regUsersCnt) = $dbLink->nextRecord();
  	$dbLink->cleanResults();
--- 119,127 ----
  else
  {
+ 	$slashedAdminNick = pmcSlashSingleQuotes($dbSessionVars['authUsername']);
  
  	// Ensure at least one registered user exists (except the administrator)
  	// before displaying the mail form
! 	$dbLink->query("SELECT COUNT(*) FROM " . C_REG_TBL . " WHERE username != '$slashedAdminNick' LIMIT 1");
  	list($regUsersCnt) = $dbLink->nextRecord();
  	$dbLink->cleanResults();
***************
*** 146,156 ****
  		<?php
  		echo("\n");
! 		$dbLink->query("SELECT username, latin1, email FROM " . C_REG_TBL . " WHERE perms != 'admin' ORDER BY username");
! 		while (list($username, $latin1, $email) = $dbLink->nextRecord())
  		{
  			$username	= pmcHandleMagicQuotes($username, '', '1', 'del');
  			$email		= pmcHandleMagicQuotes($email, '', '1', 'del');
  			echo("\t\t\t\t\t\t\t\t");
! 			echo('<option value="' . $email . ' ' . htmlspecialchars($username) . '">' . pmcSpecialChars($username, $latin1) . '</option>');
  			echo("\n");
  		}
--- 147,158 ----
  		<?php
  		echo("\n");
! 		$dbLink->query("SELECT username, charset, email FROM " . C_REG_TBL . " WHERE username != '$slashedAdminNick' ORDER BY username");
! 		while (list($username, $usrCharset, $email) = $dbLink->nextRecord())
  		{
  			$username	= pmcHandleMagicQuotes($username, '', '1', 'del');
+ 			$latin1		= ($usrCharset == 'iso-8859-1') ? 1 : 0;
  			$email		= pmcHandleMagicQuotes($email, '', '1', 'del');
  			echo("\t\t\t\t\t\t\t\t");
! 			echo('<option value="' . $email . ' ' . htmlspecialchars($username) . ' ' . $usrCharset . '">' . pmcSpecialChars($username, $latin1) . '</option>');
  			echo("\n");
  		}

Index: admin_body.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/admin/admin_body.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4

Index: admin_top.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/admin/admin_top.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/lib/index_libs do_enter_db_work.lib.php3,1.19,1.20 do_enter_js_work.lib.php3,1.12,1.13 index_validation.lib.php3,1.13,1.14 main_index.lib.php3,1.34,1.35 msg_validation.lib.js,1.3,1.4 start_page.lib.js,1.11,1.12

From: Lo?c C. <lo...@us...> - 2001-06-10 14:58:21

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

Modified Files:
	do_enter_db_work.lib.php3 do_enter_js_work.lib.php3 
	index_validation.lib.php3 main_index.lib.php3 
	msg_validation.lib.js start_page.lib.js 
Log Message:
Too many changes to detail.

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.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** do_enter_db_work.lib.php3	2001/05/30 08:07:12	1.19
--- do_enter_db_work.lib.php3	2001/06/10 14:57:48	1.20
***************
*** 104,108 ****
  if ($isRegUser)
  {
! 	$slashedPswd		= pmcSlashSingleQuotes(str_replace('\\', '\\\\', $password));
  	$dbLink->query("UPDATE " . C_REG_TBL . " SET password = '$slashedPswd', reg_time = $currentTime, ip = '$ip' WHERE username = '$slashedNick'");
  }
--- 104,108 ----
  if ($isRegUser)
  {
! 	$slashedPswd		= pmcSlashSingleQuotes(str_replace('\\', '\\\\', $pmcPassword));
  	$dbLink->query("UPDATE " . C_REG_TBL . " SET password = '$slashedPswd', reg_time = $currentTime, ip = '$ip' WHERE username = '$slashedNick'");
  }
***************
*** 137,166 ****
  	{
  		$slashedPrevRoomName = pmcSlashSingleQuotes($wasInRoom);
- 		$dbLink->query("SELECT type FROM " . C_MSG_TBL . " WHERE room = '$slashedPrevRoomName' LIMIT 1");
- 		list($prevRoomType) = $dbLink->nextRecord();
  		$dbLink->cleanResults();
  		$aQuery		= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  					. 'VALUES ('
! 					. "$prevRoomType, '$slashedPrevRoomName', 'SYS exit', '', $currentTime, NULL, '#666699', 'sprintf(L_EXIT_ROM, \'$nickForNotifications\')', 'sprintf(L_EXIT_ROM, \'$nickForNotifications\')'"
  					. ')';
  		$dbLink->query($aQuery);
  
  		$aQuery		= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  					. 'VALUES ('
! 					. "$roomType, '$slashedTargetRoomName', 'SYS enter', '', $currentTime, NULL, '#666699', 'sprintf(L_ENTER_ROM, \'$nickForNotifications\')', 'sprintf(L_ENTER_ROM, \'$nickForNotifications\')'"
  					. ')';
  		$dbLink->query($aQuery);
! 		$dbLink->query("UPDATE " . C_USR_TBL . " SET session_id = '$dbSessionId', u_time = $currentTime, room = '$slashedTargetRoomName', status = '$status', ip = '$ip' WHERE session_id = '$previousId'");
  
  		if (C_WELCOME)
  		{
! 			// Delete the old welcome messages sent to the current user
! 			$dbLink->query("DELETE FROM " . C_MSG_TBL . " WHERE username = 'SYS welcome' AND address = '$slashedNick'");
  			$aQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  					. 'VALUES ('
! 					. "$roomType, '$slashedTargetRoomName', 'SYS welcome', '', $currentTimePlus, '$slashedNick', '#666699', '$slashedWelcomeMsg', '$slashedWelcomeMsg'"
  					. ')';
  			$dbLink->query($aQuery);
--- 137,166 ----
  	{
  		$slashedPrevRoomName = pmcSlashSingleQuotes($wasInRoom);
  		$dbLink->cleanResults();
  		$aQuery		= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(room, username, m_time, color, msg_original, msg_enhanced) '
  					. 'VALUES ('
! 					. "'$slashedPrevRoomName', 'SYS exit', $currentTime, '#666699', 'sprintf(L_EXIT_ROM, \'$nickForNotifications\')', 'sprintf(L_EXIT_ROM, \'$nickForNotifications\')'"
  					. ')';
  		$dbLink->query($aQuery);
  
  		$aQuery		= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(room, username, m_time, color, msg_original, msg_enhanced) '
  					. 'VALUES ('
! 					. "'$slashedTargetRoomName', 'SYS enter', $currentTime, '#666699', 'sprintf(L_ENTER_ROM, \'$nickForNotifications\')', 'sprintf(L_ENTER_ROM, \'$nickForNotifications\')'"
  					. ')';
  		$dbLink->query($aQuery);
! 		$dbLink->query("UPDATE " . C_USR_TBL . " SET session_id = '$dbSessionId', u_time = $currentTime, room = '$slashedTargetRoomName', status = $status, ip = '$ip' WHERE session_id = '$previousId'");
  
  		if (C_WELCOME)
  		{
! 			// Delete the old welcome messages sent to the current user (check
! 			// if m_time and rooms aren't null to enforce the use of existing
! 			// indexes)
! 			$dbLink->query("DELETE FROM " . C_MSG_TBL . " WHERE m_time != '' AND room != '' AND address = '$slashedNick' AND username = 'SYS welcome'");
  			$aQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(room, username, m_time, address, color, msg_original, msg_enhanced) '
  					. 'VALUES ('
! 					. "'$slashedTargetRoomName', 'SYS welcome', $currentTimePlus, '$slashedNick', '#666699', '$slashedWelcomeMsg', '$slashedWelcomeMsg'"
  					. ')';
  			$dbLink->query($aQuery);
***************
*** 186,197 ****
  				. '(session_id, u_time, room, username, latin1, status, ip) '
  				. 'VALUES ('
! 				. "'$dbSessionId', $currentTime, '$slashedTargetRoomName', '$slashedNick', $latin1, '$status', '$ip'"
  				. ')';
  	$dbLink->query($aQuery);
  
  	$aQuery			= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  					. 'VALUES ('
! 					. "$roomType, '$slashedTargetRoomName', 'SYS enter', '', $currentTime, NULL, '#666699', 'sprintf(L_ENTER_ROM, \'$nickForNotifications\')', 'sprintf(L_ENTER_ROM, \'$nickForNotifications\')'"
  					. ')';
  	$dbLink->query($aQuery);
--- 186,197 ----
  				. '(session_id, u_time, room, username, latin1, status, ip) '
  				. 'VALUES ('
! 				. "'$dbSessionId', $currentTime, '$slashedTargetRoomName', '$slashedNick', $latin1, $status, '$ip'"
  				. ')';
  	$dbLink->query($aQuery);
  
  	$aQuery			= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(room, username, m_time, color, msg_original, msg_enhanced) '
  					. 'VALUES ('
! 					. "'$slashedTargetRoomName', 'SYS enter', $currentTime, '#666699', 'sprintf(L_ENTER_ROM, \'$nickForNotifications\')', 'sprintf(L_ENTER_ROM, \'$nickForNotifications\')'"
  					. ')';
  	$dbLink->query($aQuery);
***************
*** 199,208 ****
  	if (C_WELCOME)
  	{
! 		// Deletes the old welcome messages sent to the current user
! 		$dbLink->query("DELETE FROM " . C_MSG_TBL . " WHERE username = 'SYS welcome' AND address = '$slashedNick'");
  		$aQuery		= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  					. 'VALUES ('
! 					. "$roomType, '$slashedTargetRoomName', 'SYS welcome', '', $currentTimePlus, '$slashedNick', '#666699', '$slashedWelcomeMsg', '$slashedWelcomeMsg'"
  					. ')';
  		$dbLink->query($aQuery);
--- 199,209 ----
  	if (C_WELCOME)
  	{
! 		// Deletes the old welcome messages sent to the current user (check if
! 		// m_time and rooms aren't null to enforce the use of existing indexes)
! 		$dbLink->query("DELETE FROM " . C_MSG_TBL . " WHERE m_time != '' AND room != '' AND address = '$slashedNick' AND username = 'SYS welcome'");
  		$aQuery		= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(room, username, m_time, address, color, msg_original, msg_enhanced) '
  					. 'VALUES ('
! 					. "'$slashedTargetRoomName', 'SYS welcome', $currentTimePlus, '$slashedNick', '#666699', '$slashedWelcomeMsg', '$slashedWelcomeMsg'"
  					. ')';
  		$dbLink->query($aQuery);
***************
*** 212,215 ****
--- 213,226 ----
  
  /**
+  * Updates the rooms table
+  */
+ $dbLink->query("UPDATE " . C_ROOM_TBL . " SET last_user_modif = $currentTime WHERE room_name = '$slashedTargetRoomName'");
+ if (!$dbLink->affectedRows())
+ {
+ 	$dbLink->query("INSERT INTO " . C_ROOM_TBL . " (room_type, room_name, last_user_modif) VALUES ($roomType, '$slashedTargetRoomName', $currentTime)");
+ }
+ 
+ 
+ /**
   * Prepares (ie removes unnecessary data) and saves session data
   */
***************
*** 227,235 ****
  $dbSessionVars['lang']				= $keptLang;
  $dbSessionVars['jsVersion']			= $jsVersion;
! $dbSessionVars['nick']				= $nick;
! $dbSessionVars['password']			= $password;
  $dbSessionVars['roomType']			= $roomType;
  $dbSessionVars['currentRoom']		= $targetRoom;
! $dbSessionVars['status']			= (empty($status)) ? 'u' : $status;
  $dbSessionVars['refreshDelay']		= C_MSG_REFRESH;
  $dbSessionVars['msgKind']			= $msgKind;
--- 238,247 ----
  $dbSessionVars['lang']				= $keptLang;
  $dbSessionVars['jsVersion']			= $jsVersion;
! $dbSessionVars['nick']				= $pmcNick;
! $dbSessionVars['password']			= $pmcPassword;
  $dbSessionVars['roomType']			= $roomType;
  $dbSessionVars['currentRoom']		= $targetRoom;
! $dbSessionVars['status']			= $status;
! $dbSessionVars['away']				= 0;
  $dbSessionVars['refreshDelay']		= C_MSG_REFRESH;
  $dbSessionVars['msgKind']			= $msgKind;
***************
*** 254,259 ****
  /**
   * Deletes invite messages sent to the user for the room he will enter in
   */
! $dbLink->query("DELETE FROM " . C_MSG_TBL . " WHERE username = 'SYS inviteTo' AND address = '$slashedNick' AND room = '$slashedTargetRoomName'");
  
  ?>
--- 266,272 ----
  /**
   * Deletes invite messages sent to the user for the room he will enter in
+  * (check if m_time isn't null to enforce the use of existing indexes)
   */
! $dbLink->query("DELETE FROM " . C_MSG_TBL . " WHERE m_time != '' AND room = '$slashedTargetRoomName' AND address = '$slashedNick' AND username = 'SYS inviteTo'");
  
  ?>

Index: do_enter_js_work.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/do_enter_js_work.lib.php3,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** do_enter_js_work.lib.php3	2001/05/30 08:07:12	1.12
--- do_enter_js_work.lib.php3	2001/06/10 14:57:48	1.13
***************
*** 62,66 ****
  <script type="text/javascript" language="javascript1.1">
  <!--
! var jsIsModerator		= <?php echo((isset($status) && ($status == 'a' || $status == 'm')) ? 1 : 0); ?>;
  // -->
  </script>
--- 62,66 ----
  <script type="text/javascript" language="javascript1.1">
  <!--
! var jsIsModerator		= <?php echo(($status >= 5) ? 1 : 0); ?>;
  // -->
  </script>

Index: index_validation.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/index_validation.lib.php3,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** index_validation.lib.php3	2001/05/23 21:40:30	1.13
--- index_validation.lib.php3	2001/06/10 14:57:48	1.14
***************
*** 38,43 ****
   *
   * @param	string	true if the nick is a registered one
-  * @param	string	permission level associated to the nick
-  * @param	string	list of the room moderated by the user
   * @param	string	previous id of the user whith the same nick
   * @param	string	name of the room the user was chatting into
--- 38,41 ----
***************
*** 54,64 ****
   * @access	public
   */
! function pmcValidateNickAndPaswd(	&$isRegNick, &$regNickPerms, &$regNickModeratedRooms,
! 									&$loggedInId, &$loggedInRoom)
  {
  	global $isJsValidated;
  	global $dbLink;
! 	global $nick, $slashedNick;
! 	global $password;
  
  	$error1		= '';
--- 52,61 ----
   * @access	public
   */
! function pmcValidateNickAndPaswd(&$isRegNick, &$loggedInId, &$loggedInRoom)
  {
  	global $isJsValidated;
  	global $dbLink;
! 	global $pmcNick, $slashedNick;
! 	global $pmcPassword;
  
  	$error1		= '';
***************
*** 68,72 ****
  	// 1. Ensures invalid characters/words aren't in use for the nick
  	// Ensures a nick has been submitted
! 	if (!$isJsValidated && $nick == '')
  	{
  		$error1				= L_ERR_USR_2;
--- 65,69 ----
  	// 1. Ensures invalid characters/words aren't in use for the nick
  	// Ensures a nick has been submitted
! 	if (!$isJsValidated && $pmcNick == '')
  	{
  		$error1				= L_ERR_USR_2;
***************
*** 74,78 ****
  	// Checks for invalid characters or empty nick
  	else if (!$isJsValidated && 
! 				(trim($nick) == '' || ereg('[\, ]', $nick)))
  	{
  		$error1				= L_ERR_USR_16;
--- 71,75 ----
  	// Checks for invalid characters or empty nick
  	else if (!$isJsValidated && 
! 				(trim($pmcNick) == '' || ereg('[\, ]', $pmcNick)))
  	{
  		$error1				= L_ERR_USR_16;
***************
*** 81,85 ****
  	else if (C_NO_SWEAR)
  	{
! 		if (checkWords($nick, true))
  		{
  			$error1			= L_ERR_USR_18;
--- 78,82 ----
  	else if (C_NO_SWEAR)
  	{
! 		if (checkWords($pmcNick, true))
  		{
  			$error1			= L_ERR_USR_18;
***************
*** 106,110 ****
  	if ($error1 == '' && !$isJsValidated && $requireReg)
  	{
! 		if ($password == '')
  		{
  			$error1			= ($isLoggedIn) ? L_ERR_USR_1 : L_ERR_USR_14;
--- 103,107 ----
  	if ($error1 == '' && !$isJsValidated && $requireReg)
  	{
! 		if ($pmcPassword == '')
  		{
  			$error1			= ($isLoggedIn) ? L_ERR_USR_1 : L_ERR_USR_14;
***************
*** 114,126 ****
  
  	// 4. Ensure a valid password has been submitted if the nick is a
! 	//    registered one, then gets permission levels for this nick
  	if ($error1 == '')
  	{
! 		$dbLink->query("SELECT password, perms, rooms FROM " . C_REG_TBL . " WHERE username = '$slashedNick' LIMIT 1");
! 		$isRegNick = (list($regUserPassword, $regNickPerms, $regNickModeratedRooms) = $dbLink->nextRecord());
  		if ($isRegNick)
  		{
  			$regUserPassword			= pmcHandleMagicQuotes($regUserPassword, '', 1, 'del');
- 			$regNickModeratedRooms		= pmcHandleMagicQuotes($regNickModeratedRooms, '', 1, 'del');
  		}
  		$dbLink->cleanResults();
--- 111,122 ----
  
  	// 4. Ensure a valid password has been submitted if the nick is a
! 	//    registered one
  	if ($error1 == '')
  	{
! 		$dbLink->query("SELECT password FROM " . C_REG_TBL . " WHERE username = '$slashedNick' LIMIT 1");
! 		$isRegNick = (list($regUserPassword) = $dbLink->nextRecord());
  		if ($isRegNick)
  		{
  			$regUserPassword			= pmcHandleMagicQuotes($regUserPassword, '', 1, 'del');
  		}
  		$dbLink->cleanResults();
***************
*** 136,140 ****
  		{
  			// Reserved nick but no password submitted -> deny access
! 			if (!$isJsValidated && $password == '')
  			{
  				$error1 				= L_ERR_USR_3;
--- 132,136 ----
  		{
  			// Reserved nick but no password submitted -> deny access
! 			if (!$isJsValidated && $pmcPassword == '')
  			{
  				$error1 				= L_ERR_USR_3;
***************
*** 142,151 ****
  			// Validates the password submitted (compare also its md5 hash for
  			// compatibility with old releases)
! 			else if ($regUserPassword != $password && $regUserPassword != md5($password))
  			{
  				$isRegNick				= false;
! 				$password				= '';
! 				$regNickPerms			= 'user';
! 				$regNickModeratedRooms	= '';
  				$error1					= L_ERR_USR_4;
  			}
--- 138,145 ----
  			// Validates the password submitted (compare also its md5 hash for
  			// compatibility with old releases)
! 			else if ($regUserPassword != $pmcPassword && $regUserPassword != md5($pmcPassword))
  			{
  				$isRegNick				= false;
! 				$pmcPassword			= '';
  				$error1					= L_ERR_USR_4;
  			}
***************
*** 160,165 ****
  
  /**
!  * Validates the name of the room to create and defines the permission level
!  * the user will be granted inside this room
   *
   * @return	string	error number
--- 154,158 ----
  
  /**
!  * Validates the name of the room to create
   *
   * @return	string	error number
***************
*** 231,235 ****
  		{
  			$theSlashedRoomName = pmcSlashSingleQuotes($targetRoom);
! 			$dbLink->query("SELECT type, room FROM " . C_MSG_TBL . " WHERE room = '$theSlashedRoomName' LIMIT 1");
  			$roomExist			= (list($trueType, $trueCaseName) = $dbLink->nextRecord());
  			$dbLink->cleanResults();
--- 224,228 ----
  		{
  			$theSlashedRoomName = pmcSlashSingleQuotes($targetRoom);
! 			$dbLink->query("SELECT room_type, room_name FROM " . C_ROOM_TBL . " WHERE room_name = '$theSlashedRoomName' LIMIT 1");
  			$roomExist			= (list($trueType, $trueCaseName) = $dbLink->nextRecord());
  			$dbLink->cleanResults();

Index: main_index.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/main_index.lib.php3,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** main_index.lib.php3	2001/05/30 08:07:12	1.34
--- main_index.lib.php3	2001/06/10 14:57:48	1.35
***************
*** 74,81 ****
  if (!empty($newTargetRoom))
  	$newTargetRoom			= pmcHandleMagicQuotes($newTargetRoom, '1', '', 'del');
! if (!empty($nick))
! 	$nick					= pmcHandleMagicQuotes($nick, '1', '', 'del');
! if (!empty($password))
! 	$password				= pmcHandleMagicQuotes($password, '1', '', 'del');
  if (!empty($enterDefaultRoomName))
  	$enterDefaultRoomName	= pmcHandleMagicQuotes($enterDefaultRoomName, '1', '', 'del');
--- 74,81 ----
  if (!empty($newTargetRoom))
  	$newTargetRoom			= pmcHandleMagicQuotes($newTargetRoom, '1', '', 'del');
! if (!empty($pmcNick))
! 	$pmcNick				= pmcHandleMagicQuotes($pmcNick, '1', '', 'del');
! if (!empty($pmcPassword))
! 	$pmcPassword			= pmcHandleMagicQuotes($pmcPassword, '1', '', 'del');
  if (!empty($enterDefaultRoomName))
  	$enterDefaultRoomName	= pmcHandleMagicQuotes($enterDefaultRoomName, '1', '', 'del');
***************
*** 84,89 ****
  if (!empty($createRoomName))
  	$createRoomName			= pmcHandleMagicQuotes($createRoomName, '1', '', 'del');
! if (!empty($cookieUsername))
! 	$cookieUsername			= urldecode(pmcHandleMagicQuotes($cookieUsername, '1', '', 'del'));
  if (!empty($cookieRoom))
  	$cookieRoom				= urldecode(pmcHandleMagicQuotes($cookieRoom, '1', '', 'del'));
--- 84,89 ----
  if (!empty($createRoomName))
  	$createRoomName			= pmcHandleMagicQuotes($createRoomName, '1', '', 'del');
! if (!empty($cookiePmcUsername))
! 	$cookiePmcUsername		= urldecode(pmcHandleMagicQuotes($cookiePmcUsername, '1', '', 'del'));
  if (!empty($cookieRoom))
  	$cookieRoom				= urldecode(pmcHandleMagicQuotes($cookieRoom, '1', '', 'del'));
***************
*** 128,131 ****
--- 128,133 ----
  if (empty($isJsValidated))
  	$isJsValidated		= 0;
+ if (isset($chattingCnt))
+ 	unset($chattingCnt);
  
  // Get the relative path to the script that called this one
***************
*** 135,146 ****
  // Sets the $isFontMsg to true when the user logs in for the first time and a
  // specific font face have to be used (iso-code is 'x-user-defined')
! $isFontMsg		= (empty($nick) && defined('L_FONT_NAME'));
  $latin1			= (L_CHARSET == 'iso-8859-1') ? 1 : 0;
  
  // Try to get the nickname from session data, then slashes it
! if (empty($nick) && dbSessionIsRegistered('nick'))
! 	$nick			= $dbSessionVars['nick'];
! if (isset($nick))
! 	$slashedNick	= pmcSlashSingleQuotes($nick);
  
  // Unset some variables that may be the cause of security holes
--- 137,148 ----
  // Sets the $isFontMsg to true when the user logs in for the first time and a
  // specific font face have to be used (iso-code is 'x-user-defined')
! $isFontMsg		= (empty($pmcNick) && defined('L_FONT_NAME'));
  $latin1			= (L_CHARSET == 'iso-8859-1') ? 1 : 0;
  
  // Try to get the nickname from session data, then slashes it
! if (empty($pmcNick) && dbSessionIsRegistered('nick'))
! 	$pmcNick		= $dbSessionVars['nick'];
! if (isset($pmcNick))
! 	$slashedNick	= pmcSlashSingleQuotes($pmcNick);
  
  // Unset some variables that may be the cause of security holes
***************
*** 210,215 ****
  	// Defines the message to be displayed
  	if (!dbSessionIsRegistered('kicked'))
! 		$dbSessionVars['kicked'] 	= 0;
! 	$messageKind					= '';
  	switch ($dbSessionVars['kicked'])
  	{
--- 212,219 ----
  	// Defines the message to be displayed
  	if (!dbSessionIsRegistered('kicked'))
! 	{
! 		$dbSessionVars['kicked'] = 0;
! 	}
! 	$messageKind				= '';
  	switch ($dbSessionVars['kicked'])
  	{
***************
*** 237,263 ****
  			break;
  
  		default:
  			// The user regulary left the chat
  			if ($dbLink->affectedRows() > 0)
  				$messageKind	= 'L_EXIT_ROM';
  	} // end of switch
  
! 	// Display the message
  	if (!empty($messageKind))
  	{
  		$nickForNotifications	= pmcSlashSingleQuotes(pmcSpecialChars($slashedNick, $latin1), 2);
  		$exitedRoomName			= pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
! 		$exitedRoomType			= $dbSessionVars['roomType'];
  
  		$aQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  				. 'VALUES ('
! 				. "$exitedRoomType, '$exitedRoomName', 'SYS exit', '', " . time() . ", NULL, '#666699', 'sprintf($messageKind, \'$nickForNotifications\')', 'sprintf($messageKind, \'$nickForNotifications\')'"
  				. ')';
  		$dbLink->query($aQuery);
  		unset($messageKind);
  		unset($nickForNotifications);
  		unset($exitedRoomName);
- 		unset($exitedRoomType);
  	}
  
--- 241,275 ----
  			break;
  
+ 		case 5:
+ 			// Too long inactive delay
+ 			$messageKind		= 'L_EXIT_ROM';
+ 			$error				= L_ERR_USR_21;
+ 			break;
+ 
  		default:
  			// The user regulary left the chat
  			if ($dbLink->affectedRows() > 0)
+ 			{
  				$messageKind	= 'L_EXIT_ROM';
+ 			}
  	} // end of switch
  
! 	// Display the message and updates the rooms table
  	if (!empty($messageKind))
  	{
  		$nickForNotifications	= pmcSlashSingleQuotes(pmcSpecialChars($slashedNick, $latin1), 2);
  		$exitedRoomName			= pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
! 		$exitTime				= time();
  
  		$aQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(room, username, m_time, color, msg_original, msg_enhanced) '
  				. 'VALUES ('
! 				. "'$exitedRoomName', 'SYS exit', $exitTime, '#666699', 'sprintf($messageKind, \'$nickForNotifications\')', 'sprintf($messageKind, \'$nickForNotifications\')'"
  				. ')';
  		$dbLink->query($aQuery);
+ 		$dbLink->query("UPDATE " . C_ROOM_TBL . " SET last_user_modif = $exitTime WHERE room_name = '$exitedRoomName'");
  		unset($messageKind);
  		unset($nickForNotifications);
  		unset($exitedRoomName);
  	}
  
***************
*** 316,328 ****
  	if (dbSessionIsRegistered('password'))
  	{
! 		$password			= $dbSessionVars['password'];
  	}
! 	else if (!isset($password))
  	{
! 		$password			= '';
  	}
  	$isRegUser				= false;
- 	$regUserPerms			= 'noreg';
- 	$regUserModeratedRooms	= '';
  	$wasInRoom				= '';
  	$previousId				= '';
--- 328,338 ----
  	if (dbSessionIsRegistered('password'))
  	{
! 		$pmcPassword		= $dbSessionVars['password'];
  	}
! 	else if (!isset($pmcPassword))
  	{
! 		$pmcPassword		= '';
  	}
  	$isRegUser				= false;
  	$wasInRoom				= '';
  	$previousId				= '';
***************
*** 368,372 ****
  		unset($enterOtherRoomName);
  		unset($enterDefaultRoomName);
! 	}	
  
  
--- 378,382 ----
  		unset($enterOtherRoomName);
  		unset($enterDefaultRoomName);
! 	}
  
  
***************
*** 390,393 ****
--- 400,404 ----
  	 * Optimize some of the tables
  	 */
+ 	$dbLink->optimize(C_ROOM_TBL);
  	$dbLink->optimize(C_MSG_TBL);
  	$dbLink->optimize(C_USR_TBL);
***************
*** 407,419 ****
  	 * 'chat/lib/index_validation.lib.php3' library
  	 */
! 	if (empty($reloading))
  	{
! 		$error	= pmcValidateNickAndPaswd(	$isRegUser, $regUserPerms, $regUserModeratedRooms,
! 											$previousId, $wasInRoom);
  		if ($error == '')
  		{
  			// Puts the nick in a cookie that will expire in one year
! 			$cookieUsername = urlencode($nick);
! 			setcookie('cookieUsername', $cookieUsername, time() + 60*60*24*365);
  		}
  	} // end of the nick and password validation work
--- 418,429 ----
  	 * 'chat/lib/index_validation.lib.php3' library
  	 */
! 	if (empty($error) && empty($reloading))
  	{
! 		$error = pmcValidateNickAndPaswd($isRegUser, $previousId, $wasInRoom);
  		if ($error == '')
  		{
  			// Puts the nick in a cookie that will expire in one year
! 			$cookiePmcUsername = urlencode($pmcNick);
! 			setcookie('cookiePmcUsername', $cookiePmcUsername, time() + 60*60*24*365);
  		}
  	} // end of the nick and password validation work
***************
*** 421,444 ****
  
  	/**
! 	 * Gets the permission level of the user and the list of the rooms he/she
! 	 * is moderator for from the database if this script is run following a
! 	 * click on a room name at the 'users' frame.
  	 *
! 	 * The 'pmcHandleMagicQuotes()' function is defined inside the
! 	 * 'chat/lib/common.lib.php3' library
  	 */
! 	else if ($reloading == 'joinLink')
  	{
! 		$dbLink->query("SELECT perms, rooms FROM " . C_REG_TBL . " WHERE username = '$slashedNick' LIMIT 1");
! 		$isRegUser = (list($regUserPerms, $regUserModeratedRooms) = $dbLink->nextRecord());
! 		if ($isRegUser)
  		{
! 			$regUserModeratedRooms	= pmcHandleMagicQuotes($regUserModeratedRooms, '', 1, 'del');
  		}
! 		$dbLink->cleanResults();
! 	} // end of get permission level in reloading case
  
  
  	/**
  	 * Ensures the user is not banished from the room he wants to enter in
  	 *
--- 431,482 ----
  
  	/**
! 	 * Checks whether the user is the administrator or not
  	 *
! 	 * This part of the script is skipped if the frameset is reloaded because
! 	 * of the NS4+ resize bug.
  	 */
! 	if (empty($error)
! 		&& (empty($reloading) || $reloading == 'joinLink'))
  	{
! 		if (dbSessionIsRegistered('nick') && $dbSessionVars['nick'] == $pmcNick
! 			&& dbSessionIsRegistered('status'))
  		{
! 			// The status of this user is already known in session data
  		}
! 		else
! 		{
! 			$dbLink->query("SELECT COUNT(*) FROM " . C_RIGHT_TBL . " WHERE username = '$slashedNick' AND right_level > 9 LIMIT 1");
! 			list($isAdmin) = $dbLink->nextRecord();
! 			$dbLink->cleanResults();
! 			$dbSessionVars['status'] = ($isAdmin) ? 10 : '';
! 		}
! 	}
  
  
  	/**
+ 	 * Ensures the maximum number of connected users is not already reached if
+ 	 * this directive is enabled in the config file
+ 	 *
+ 	 * This part of the script is skipped if:
+ 	 * - the frameset is reloaded because of the NS4+ resize bug or because the
+ 	 *   user clicked on a room name at the 'users' frame;
+ 	 * - if he/she relogs;
+ 	 * - or if he/she is the adminsitrator.
+ 	 */
+ 	if (empty($error) && C_MAX_USERS
+ 		&& empty($reloading) && empty($wasInRoom)
+ 		&& !(dbSessionIsRegistered('status') && intval($dbSessionVars['status']) > 9))
+ 	{
+ 		$dbLink->query('SELECT COUNT(*) FROM ' . C_USR_TBL);
+ 		list($chattingCnt)	= $dbLink->nextRecord();
+ 		$dbLink->cleanResults();
+ 		if ($chattingCnt >= C_MAX_USERS)
+ 		{
+ 			$error			= L_ERR_ROM_5;
+ 		}
+ 	}
+ 
+ 	
+ 	/**
  	 * Ensures the user is not banished from the room he wants to enter in
  	 *
***************
*** 452,456 ****
  		&& (empty($reloading) || $reloading == 'joinLink'))
  	{
! 		if (C_BANISH && $regUserPerms != 'admin' && pmcCheckBanish())
  		{
  			$error = L_ERR_USR_20;
--- 490,496 ----
  		&& (empty($reloading) || $reloading == 'joinLink'))
  	{
! 		if (C_BANISH
! 			&& !(dbSessionIsRegistered('status') && intval($dbSessionVars['status']) > 9)
!  			&& pmcCheckBanish())
  		{
  			$error = L_ERR_USR_20;
***************
*** 481,493 ****
  	 * the 'chat/lib/get_user_infos.lib.php3' library.
  	 */
! 	$slashedTargetRoomName	= pmcSlashSingleQuotes($targetRoom);
! 	if (!isset($reloading) || $reloading != 'nsResize')
! 	{
! 		$status				= pmcRightLevel();
! 	}
! 	else
  	{
! 		$status				= $dbSessionVars['status'];
! 	}
  
  
--- 521,542 ----
  	 * the 'chat/lib/get_user_infos.lib.php3' library.
  	 */
! 	if ($error == '')
  	{
! 		$slashedTargetRoomName	= pmcSlashSingleQuotes($targetRoom);
! 		if (!isset($reloading))
! 		{
! 			$status				= pmcRightLevel();
! 		}		
! 		else if ($reloading != 'nsResize')
! 		{
! 			$isRegUser			= ($dbSessionVars['status'] > 0);
! 			$status				= pmcRightLevel();
! 			$isRegUser			= false;
! 		}
! 		else
! 		{
! 			$status				= $dbSessionVars['status'];
! 		}
! 	} // end of right level definition
  
  
***************
*** 634,643 ****
  
  	// Try to get the most accurate values for the form fields below
! 	if (!empty($GLOBALS['nick']))
! 		$layoutNick = $GLOBALS['nick'];
  	else if (dbSessionIsRegistered('nick'))
  		$layoutNick = $dbSessionVars['nick'];
! 	else if (isset($GLOBALS['cookieUsername']))
! 		$layoutNick = urldecode($GLOBALS['cookieUsername']);
  	else
  		$layoutNick = '';
--- 683,692 ----
  
  	// Try to get the most accurate values for the form fields below
! 	if (!empty($GLOBALS['pmcNick']))
! 		$layoutNick = $GLOBALS['pmcNick'];
  	else if (dbSessionIsRegistered('nick'))
  		$layoutNick = $dbSessionVars['nick'];
! 	else if (isset($GLOBALS['cookiePmcUsername']))
! 		$layoutNick = urldecode($GLOBALS['cookiePmcUsername']);
  	else
  		$layoutNick = '';
***************
*** 712,721 ****
  	<?php
  	// Displays informating messages
! 	echo("\t\t" . L_WEL_1 . ' ' . C_MSG_DEL . ' ' . L_WEL_2 . ' ' . C_USR_DEL . ' ' . L_WEL_3 . '<br /><br />' . "\n");
  
  	// Displays the message about currently chatting users
! 	$dbLink->query("SELECT COUNT(*) FROM " . C_USR_TBL);
! 	list($chattingCnt)	 = $dbLink->nextRecord();
! 	$dbLink->cleanResults();
  	$usersPopupLink		 = ' <a href="' . _CHAT_PATH . 'users_popup_low.' . C_EXTENSION . '?' . dbSessionSID('GET') .'" target="users_popup_' . md5(C_CHAT_URL) . '" class="chatLink" onclick="pmcUsersPopup(\'' . md5(C_CHAT_URL) . '\'); return false">';
  	$usersPopupLink		.= (($chattingCnt) ? $chattingCnt : 0) . ' ';
--- 761,777 ----
  	<?php
  	// Displays informating messages
! 	echo("\t\t" . L_WEL_1 . ' ' . C_MSG_DEL . ' ' . L_WEL_2 . ' ' . (C_USR_AWAY + C_USR_DEL) . ' ' . L_WEL_3 . '<br /><br />' . "\n");
  
  	// Displays the message about currently chatting users
! 	if (isset($GLOBALS['chattingCnt']))
! 	{
! 		$chattingCnt = $GLOBALS['chattingCnt'];
! 	}
! 	else
! 	{
! 		$dbLink->query("SELECT COUNT(*) FROM " . C_USR_TBL);
! 		list($chattingCnt)	 = $dbLink->nextRecord();
! 		$dbLink->cleanResults();
! 	}
  	$usersPopupLink		 = ' <a href="' . _CHAT_PATH . 'users_popup_low.' . C_EXTENSION . '?' . dbSessionSID('GET') .'" target="users_popup_' . md5(C_CHAT_URL) . '" class="chatLink" onclick="pmcUsersPopup(\'' . md5(C_CHAT_URL) . '\'); return false">';
  	$usersPopupLink		.= (($chattingCnt) ? $chattingCnt : 0) . ' ';
***************
*** 799,803 ****
  					<td align="<?php echo($cellAlign); ?>" valign="top" class="chatCell" nowrap="nowrap"><?php echo(L_SET_2); ?> :</td>
  					<td valign="top" class="chatCell">
! 						<input id="testSize" type="text" name="nick" size="11" maxlength="10" value="<?php echo(htmlspecialchars($layoutNick)); ?>" class="chatBox" />
  					</td>
  				</tr>
--- 855,859 ----
  					<td align="<?php echo($cellAlign); ?>" valign="top" class="chatCell" nowrap="nowrap"><?php echo(L_SET_2); ?> :</td>
  					<td valign="top" class="chatCell">
! 						<input id="testSize" type="text" name="pmcNick" size="11" maxlength="10" value="<?php echo(htmlspecialchars($layoutNick)); ?>" class="chatBox" />
  					</td>
  				</tr>
***************
*** 805,809 ****
  					<td align="<?php echo($cellAlign); ?>" valign="top" class="chatCell" nowrap="nowrap"><?php echo(L_REG_1); ?> :</td>
  					<td valign="top" class="chatCell" nowrap="nowrap">
! 						<input type="password" name="password" size="11" maxlength="16" class="chatBox" />
  	<?php
  	if (!C_REQUIRE_REGISTER)
--- 861,865 ----
  					<td align="<?php echo($cellAlign); ?>" valign="top" class="chatCell" nowrap="nowrap"><?php echo(L_REG_1); ?> :</td>
  					<td valign="top" class="chatCell" nowrap="nowrap">
! 						<input type="password" name="pmcPassword" size="11" maxlength="16" class="chatBox" />
  	<?php
  	if (!C_REQUIRE_REGISTER)
***************
*** 928,932 ****
  		echo("\n");
  
! 		$dbLink->query("SELECT DISTINCT room FROM " . C_MSG_TBL . " WHERE type = 1 AND username NOT LIKE 'SYS %' ORDER BY room");
  		while (list($room) = $dbLink->nextRecord())
  		{
--- 984,988 ----
  		echo("\n");
  
! 		$dbLink->query("SELECT DISTINCT msg.room FROM " . C_MSG_TBL . " msg, " . C_ROOM_TBL . " rm WHERE (msg.room = rm.room_name AND rm.room_type = 1) AND msg.username NOT LIKE 'SYS %' ORDER BY room");
  		while (list($room) = $dbLink->nextRecord())
  		{

Index: msg_validation.lib.js
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/msg_validation.lib.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** msg_validation.lib.js	2001/04/27 18:27:22	1.3
--- msg_validation.lib.js	2001/06/10 14:57:48	1.4
***************
*** 29,52 ****
  validCmds[0]	= /^\/!$/;
  validCmds[1]	= /^\/announce (.+)$/i;
! validCmds[2]	= /^\/ban (\* )?(.{1,30})$/i;
! validCmds[3]	= (jsIsVersion4) ? /^\/clear$/i : '';
! validCmds[4]	= /^\/(help|\?)$/i;
! validCmds[5]	= /^\/ignore( -)?( (.+))?$/i;
! validCmds[6]	= /^\/img$/i;
! validCmds[7]	= /^\/invite( (.+))+$/i;
! validCmds[8]	= /^\/join ((0|1) )?#(.{1,30})$/i;
! validCmds[9]	= /^\/kick (.{1,30})$/i;
! validCmds[10]	= /^\/me (.+)$/i;
! validCmds[11]	= /^\/(msg|to) ([^ ]{1,30}) (.+)$/i;
! validCmds[12]	= /^\/notify$/i;
! validCmds[13]	= (jsIsVersion4) ? '' : /^\/order$/i;
! validCmds[14]	= /^\/profile$/i;
! validCmds[15]	= /^\/promote (.{1,30})$/i;
! validCmds[16]	= /^\/(quit|exit|bye)( (.+))?$/i;
! validCmds[17]	= /^\/refresh( ([0-9]*))?$/i;
! validCmds[18]	= /^\/save( ([0-9]*))?$/i;
! validCmds[19]	= /^\/(show|last)( ([0-9]+))?$/i;
! validCmds[20]	= /^\/timestamp$/i;
! validCmds[21]	= /^\/whois (.{1,30})$/i;
  
  
--- 29,53 ----
  validCmds[0]	= /^\/!$/;
  validCmds[1]	= /^\/announce (.+)$/i;
! validCmds[2]	= /^\/away( (.+))?$/i;
! validCmds[3]	= /^\/ban (\* )?(.{1,30})$/i;
! validCmds[4]	= (jsIsVersion4) ? /^\/clear$/i : '';
! validCmds[5]	= /^\/(help|\?)$/i;
! validCmds[6]	= /^\/ignore( -)?( (.+))?$/i;
! validCmds[7]	= /^\/img$/i;
! validCmds[8]	= /^\/invite( (.+))+$/i;
! validCmds[9]	= /^\/join ((0|1) )?#(.{1,30})$/i;
! validCmds[10]	= /^\/kick (.{1,30})$/i;
! validCmds[11]	= /^\/me (.+)$/i;
! validCmds[12]	= /^\/(msg|to) ([^ ]{1,30}) (.+)$/i;
! validCmds[13]	= /^\/notify$/i;
! validCmds[14]	= (jsIsVersion4) ? '' : /^\/order$/i;
! validCmds[15]	= /^\/profile$/i;
! validCmds[16]	= /^\/promote (.{1,30})$/i;
! validCmds[17]	= /^\/(quit|exit|bye)( (.+))?$/i;
! validCmds[18]	= /^\/refresh( ([0-9]*))?$/i;
! validCmds[19]	= /^\/save( ([0-9]*))?$/i;
! validCmds[20]	= /^\/(show|last)( ([0-9]+))?$/i;
! validCmds[21]	= /^\/timestamp$/i;
! validCmds[22]	= /^\/whois (.{1,30})$/i;
  
  

Index: start_page.lib.js
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/start_page.lib.js,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** start_page.lib.js	2001/05/30 08:11:45	1.11
--- start_page.lib.js	2001/06/10 14:57:48	1.12
***************
*** 222,230 ****
  {
  	// The replace function (js1.2) isn't supported -> no js tests are done
! 	if (typeof(document.forms['startingForm'].elements['nick'].value.replace) == 'undefined')
  		return true;
  
! 	var nickField		= document.forms['startingForm'].elements['nick'];
! 	var pswdField		= document.forms['startingForm'].elements['password'];
  	var roomToCreate	= document.forms['startingForm'].elements['createRoomName'];
  	var	reNick			= /\\|,| /;
--- 222,230 ----
  {
  	// The replace function (js1.2) isn't supported -> no js tests are done
! 	if (typeof(document.forms['startingForm'].elements['pmcNick'].value.replace) == 'undefined')
  		return true;
  
! 	var nickField		= document.forms['startingForm'].elements['pmcNick'];
! 	var pswdField		= document.forms['startingForm'].elements['pmcPassword'];
  	var roomToCreate	= document.forms['startingForm'].elements['createRoomName'];
  	var	reNick			= /\\|,| /;

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/localization/arabic chat.loc,1.9,1.10 tutorial.loc,1.8,1.9

From: Lo?c C. <lo...@us...> - 2001-06-10 14:58:21

Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/arabic
In directory usw-pr-cvs1:/tmp/cvs-serv17318/chat/localization/arabic

Modified Files:
	chat.loc tutorial.loc 
Log Message:
Too many changes to detail.

Index: chat.loc
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/arabic/chat.loc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** chat.loc	2001/05/16 20:52:55	1.9
--- chat.loc	2001/06/10 14:57:48	1.10
***************
*** 131,138 ****
--- 131,140 ----
  define('L_ERR_USR_19', 'ÚÝæÇð... ÃäÊ ÊÓÊÎÏã ÃßËÑ ãä ÓÇÍÉ ÏÑÏÔÉ Ýí äÝÓ ÇáæÞÊ');
  define('L_ERR_USR_20', 'áÞÏ Êã ÅÈÚÇÏß ãä åÐå ÇáÓÇÍÉ Ãæ ãä ÌãíÚ ÇáÓÇÍÇÊ.');
+ define('L_ERR_USR_21', 'The maximum inactivity delay has been reached.');
  define('L_ERR_ROM_1', 'ÃÓãÇÁ ÇáÓÇÍÇÊ áÇÊÍÊæí Úáì (\\).');
  define('L_ERR_ROM_2', 'ÅÓã ÇáÓÇÍÉ ÇáÐí ÇÎÊÑÊå ÓíÁ ááÛÇíÉ.');
  define('L_ERR_ROM_3', 'ÚÝæÇð...ÅÓã ÇáÓÇÍÉ ÇáÐí ÇÎÊÑÊå ãÓÊÎÏã ãä ÞÈá ãÓÊÎÏã ÂÎÑ');
  define('L_ERR_ROM_4', 'ÛíÑ ÞÇÏÑ Úáì ÇáÇÓÊãÑÇÑ');
+ define('L_ERR_ROM_5', 'The maximum number of connected users is reached.');
  
  // users frame or popup
***************
*** 207,210 ****
--- 209,213 ----
  define('L_HELP_CMD_20', 'Describe what you\'re doing without refer yourself.');
  define('L_HELP_CMD_21', 'Enable/disable graphical smilies mode.');
+ define('L_HELP_CMD_22', 'Tell the other users you\'re not paying attention to the chat ou set you being back. You can also send a message with this command.');
  
  // smilies popup

Index: tutorial.loc
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/arabic/tutorial.loc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** tutorial.loc	2001/05/07 21:09:51	1.8
--- tutorial.loc	2001/06/10 14:57:48	1.9
***************
*** 160,163 ****
--- 160,164 ----
  &nbsp;&nbsp;&nbsp;&nbsp;<a href="#actions" class="topLink">Actions</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;<a href="#ignore" class="topLink">ÞÇÆãÉ ÇáÊÌÇåá</a><br />
+ &nbsp;&nbsp;&nbsp;&nbsp;<a href="#away" class="topLink">Doing a pause</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;<a href="#whois" class="topLink">ØáÈ ÇáãáÝ ÇáÔÎÕí áÚÖæ ãÚíä</a><br />
  <?php
***************
*** 348,352 ****
--- 349,356 ----
  </p>
  <p>
+ <!-- To update
  ãÚÑÝÉ ãä åã ÇáãÓÊÎÏãíä áÓÇÍÇÊ ÇáÍæÇÑ:
+ -->
+ Three basic rules have been defined for the users list:
  </p>
  <ol>
***************
*** 356,359 ****
--- 360,364 ----
  	<li>a little icon that shows gender is displayed before the nick of a registered user (clicking on it will launch the <a href="#whois">whois popup</a> for this user), while unregistered users have nothing but blank spaces displayed before their nick;</li>
  	<li>ÇáãÑÇÞÈ ÇáÚÇã æÃÕÍÇÈ ÇáÓÇÍÇÊ ÇáÎÇÕÉ ÊßÊÈ ÃÓãÇÆã ÈÎØ ãÇÆá.</li>
+ 	<li>the nicks of <a href="#away">inactive users</a> have a horizontal line striking through them.</li>
  </ol>
  <p>
***************
*** 372,376 ****
  		<li>Mary ÒÇÆÑÉ.</li>
  		-->
! 		<li>alien (whose gender is unknown), Jezek2 and Caridad are registered users with no extra "power" for the phpMyChat room;<br /><br /></li>
  		<li>lolo is a simple unregistered user.</li>
  	</ul>
--- 377,381 ----
  		<li>Mary ÒÇÆÑÉ.</li>
  		-->
! 		<li>alien (whose gender is unknown), Jezek2 (who is not paying attention to the chat) and Caridad are registered users with no extra "power" for the phpMyChat room;<br /><br /></li>
  		<li>lolo is a simple unregistered user.</li>
  	</ul>
***************
*** 745,748 ****
--- 750,770 ----
  </p>
  <p align="right"><a href="#top">ÇáÚæÏÉ Çáì ÇáÞÇÆãÉ ÇáÑÆíÓíÉ</a></p>
+ <hr />
+ 
+ <p>
+ <font size="+1"><a name="away"><b>Doing a pause:</b></a></font>
+ </p>
+ <p>
+ To tell the other users you're not paying attention to the chat while being connected, type the <b>command "/away"</b> without quotes.<br />
+ Then your username will be displayed with a horizontal line striking through it in the users' list.
+ </p>
+ <p>
+ To come back to the chat, just send a new message or use again the "/away" command.
+ </p>
+ <p>
+ Note that you may send a message with the away ccommand.<br />
+ <i>For example :</i> /away I'll be back in a few minutes.
+ </p>
+ <p align="right"><a href="#top">Back to the top</a></p>
  <hr />

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/localization/argentinian_spanish chat.loc,1.1,1.2 tutorial.loc,1.1,1.2

From: Lo?c C. <lo...@us...> - 2001-06-10 14:58:21

Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/argentinian_spanish
In directory usw-pr-cvs1:/tmp/cvs-serv17318/chat/localization/argentinian_spanish

Modified Files:
	chat.loc tutorial.loc 
Log Message:
Too many changes to detail.

Index: chat.loc
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/argentinian_spanish/chat.loc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** chat.loc	2001/05/30 19:19:18	1.1
--- chat.loc	2001/06/10 14:57:48	1.2
***************
*** 131,138 ****
--- 131,140 ----
  define('L_ERR_USR_19', 'No puedes estar en más de un salón al mismo tiempo.');
  define('L_ERR_USR_20', 'Has sido bloqueado desde este salón o desde el chat.');
+ define('L_ERR_USR_21', 'The maximum inactivity delay has been reached.');
  define('L_ERR_ROM_1', 'Los nombres de los salones no pueden contener comas o barras (\\).');
  define('L_ERR_ROM_2', 'Hay palabras no válidas en el nombre del salón que quieres crear.');
  define('L_ERR_ROM_3', 'Este salón ya existe como público.');
  define('L_ERR_ROM_4', 'Nombre de salón inválido.');
+ define('L_ERR_ROM_5', 'The maximum number of connected users is reached.');
  
  // users frame or popup
***************
*** 207,210 ****
--- 209,213 ----
  define('L_HELP_CMD_20', 'Describe que estás haciendo, sin refererirte a ti mismo.');
  define('L_HELP_CMD_21', 'Enable/disable graphical smilies mode.');
+ define('L_HELP_CMD_22', 'Tell the other users you\'re not paying attention to the chat ou set you being back. You can also send a message with this command.');
  
  // smilies popup

Index: tutorial.loc
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/argentinian_spanish/tutorial.loc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** tutorial.loc	2001/05/30 19:19:18	1.1
--- tutorial.loc	2001/06/10 14:57:48	1.2
***************
*** 160,163 ****
--- 160,164 ----
  &nbsp;&nbsp;&nbsp;&nbsp;<a href="#actions" class="topLink">Acciones</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;<a href="#ignore" class="topLink">Ignorar a otros usuarios</a><br />
+ &nbsp;&nbsp;&nbsp;&nbsp;<a href="#away" class="topLink">Doing a pause</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;<a href="#whois" class="topLink">Obtener información pública de otros usuarios</a><br />
  <?php
***************
*** 320,328 ****
  </p>
  <p>
  Dos reglas básicas han sido definidas para la lista de usuarios:
  </p>
  <ol>
  	<li>Un pequeño icono (que indica también su sexo) es mostrado antes del nick de un usuario registrado (haciendo click sobre él, se abrirá <a href="#whois">la ventana de búsqueda</a> para este usuario), mientras que para usuarios no registrados no se presenta ningún signo o ícono asociado a su <i>nick</i> (alias);</li>
! 	<li>el nick del administrador o del moderador aparece con caracteres itálicos.</li>
  </ol>
  <p>
--- 321,333 ----
  </p>
  <p>
+ <!-- To update
  Dos reglas básicas han sido definidas para la lista de usuarios:
+ -->
+ Three basic rules have been defined for the users list:
  </p>
  <ol>
  	<li>Un pequeño icono (que indica también su sexo) es mostrado antes del nick de un usuario registrado (haciendo click sobre él, se abrirá <a href="#whois">la ventana de búsqueda</a> para este usuario), mientras que para usuarios no registrados no se presenta ningún signo o ícono asociado a su <i>nick</i> (alias);</li>
! 	<li>el nick del administrador o del moderador aparece con caracteres itálicos;</li>
! 	<li>the nicks of <a href="#away">inactive users</a> have a horizontal line striking through them.</li>
  </ol>
  <p>
***************
*** 337,341 ****
  	<ul>
  		<li>Nicolas es el administrador o uno de los moderadores del salón phpMyChat;<br /><br /></li>
! 		<li>alien (cuyo sexo no se ha especificado), Jezek2 y Caridad son usuarios registrados sin "atributos" especiales para el salón phpMyChat;<br /><br /></li>
  		<li>lolo es un simple usuario no registrado.</li>
  	</ul>
--- 342,346 ----
  	<ul>
  		<li>Nicolas es el administrador o uno de los moderadores del salón phpMyChat;<br /><br /></li>
! 		<li>alien (cuyo sexo no se ha especificado), Jezek2 (who is not paying attention to the chat) y Caridad son usuarios registrados sin "atributos" especiales para el salón phpMyChat;<br /><br /></li>
  		<li>lolo es un simple usuario no registrado.</li>
  	</ul>
***************
*** 684,687 ****
--- 689,709 ----
  </p>
  <p align="right"><a href="#top">Volver al comienzo</a></p>
+ <hr />
+ 
+ <p>
+ <font size="+1"><a name="away"><b>Doing a pause:</b></a></font>
+ </p>
+ <p>
+ To tell the other users you're not paying attention to the chat while being connected, type the <b>command "/away"</b> without quotes.<br />
+ Then your username will be displayed with a horizontal line striking through it in the users' list.
+ </p>
+ <p>
+ To come back to the chat, just send a new message or use again the "/away" command.
+ </p>
+ <p>
+ Note that you may send a message with the away ccommand.<br />
+ <i>For example :</i> /away I'll be back in a few minutes.
+ </p>
+ <p align="right"><a href="#top">Back to the top</a></p>
  <hr />

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/localization/bosnian chat.loc,1.9,1.10 tutorial.loc,1.9,1.10

From: Lo?c C. <lo...@us...> - 2001-06-10 14:58:21

Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/bosnian
In directory usw-pr-cvs1:/tmp/cvs-serv17318/chat/localization/bosnian

Modified Files:
	chat.loc tutorial.loc 
Log Message:
Too many changes to detail.

Index: chat.loc
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/bosnian/chat.loc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** chat.loc	2001/05/16 20:52:55	1.9
--- chat.loc	2001/06/10 14:57:48	1.10
***************
*** 131,138 ****
--- 131,140 ----
  define('L_ERR_USR_19', 'You cannot be in more than one room at the same time.');
  define('L_ERR_USR_20', 'You have been banished from this room or from the chat.');
+ define('L_ERR_USR_21', 'The maximum inactivity delay has been reached.');
  define('L_ERR_ROM_1', 'Ime sobe ne moze sadrzavati zarez ili kosu crtu (\\).');
  define('L_ERR_ROM_2', 'Zabranjena rijec je pronaðdjena u imenu sobe koju zelite napraviti.');
  define('L_ERR_ROM_3', 'This room already exist as a public one.');
  define('L_ERR_ROM_4', 'Invalid room name.');
+ define('L_ERR_ROM_5', 'The maximum number of connected users is reached.');
  
  // users frame or popup
***************
*** 208,211 ****
--- 210,214 ----
  define('L_HELP_CMD_20', 'Describe what you\'re doing without refer yourself.');
  define('L_HELP_CMD_21', 'Enable/disable graphical smilies mode.');
+ define('L_HELP_CMD_22', 'Tell the other users you\'re not paying attention to the chat ou set you being back. You can also send a message with this command.');
  
  // smilies popup

Index: tutorial.loc
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/bosnian/tutorial.loc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** tutorial.loc	2001/05/07 21:09:51	1.9
--- tutorial.loc	2001/06/10 14:57:48	1.10
***************
*** 159,162 ****
--- 159,163 ----
  &nbsp;&nbsp;&nbsp;&nbsp;<a href="#actions" class="topLink">Actions</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;<a href="#ignore" class="topLink">Ignorisanje ostalih korisnika</a><br />
+ &nbsp;&nbsp;&nbsp;&nbsp;<a href="#away" class="topLink">Doing a pause</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;<a href="#whois" class="topLink">Dobivanje javnih informacija odrugim korisnicima</a><br />
  <?php
***************
*** 322,330 ****
  </p>
  <p>
! Two basic rules have been defined for the users list:
  </p>
  <ol>
  	<li>a little icon that shows gender is displayed before the nick of a registered user (clicking on it will launch the <a href="#whois">whois popup</a> for this user), while unregistered users have nothing but blank spaces displayed before their nick;</li>
! 	<li>the nick of the administrator or of a moderator is italicized.</li>
  </ol>
  <p><i>For example</i>, from the snapshot below you can conclude that:</p>
--- 323,332 ----
  </p>
  <p>
! Three basic rules have been defined for the users list:
  </p>
  <ol>
  	<li>a little icon that shows gender is displayed before the nick of a registered user (clicking on it will launch the <a href="#whois">whois popup</a> for this user), while unregistered users have nothing but blank spaces displayed before their nick;</li>
! 	<li>the nick of the administrator or of a moderator is italicized;</li>
! 	<li>the nicks of <a href="#away">inactive users</a> have a horizontal line striking through them.</li>
  </ol>
  <p><i>For example</i>, from the snapshot below you can conclude that:</p>
***************
*** 337,341 ****
  	<ul>
  		<li>Nicolas is the admin or one of the moderators of the phpMyChat room;<br /><br /></li>
! 		<li>alien (whose gender is unknown), Jezek2 and Caridad are registered users with no extra "power" for the phpMyChat room;<br /><br /></li>
  		<li>lolo is a simple unregistered user.</li>
  	</ul>
--- 339,343 ----
  	<ul>
  		<li>Nicolas is the admin or one of the moderators of the phpMyChat room;<br /><br /></li>
! 		<li>alien (whose gender is unknown), Jezek2 (who is not paying attention to the chat) and Caridad are registered users with no extra "power" for the phpMyChat room;<br /><br /></li>
  		<li>lolo is a simple unregistered user.</li>
  	</ul>
***************
*** 686,689 ****
--- 688,708 ----
  <p>
  Oznacite da mozete staviti vise od jednog korisnickog imena u ignorirajucu komandu (npr "/ignorisi Jack,Helen,Alf" ili "/ignorsi - Jack,Alf"). Moraju biti rastavljeni sa zarezom (,) bez razmaka.
+ </p>
+ <p align="right"><a href="#top">Povratak na vrh</a></p>
+ <hr />
+ 
+ <p>
+ <font size="+1"><a name="away"><b>Doing a pause:</b></a></font>
+ </p>
+ <p>
+ To tell the other users you're not paying attention to the chat while being connected, type the <b>command "/away"</b> without quotes.<br />
+ Then your username will be displayed with a horizontal line striking through it in the users' list.
+ </p>
+ <p>
+ To come back to the chat, just send a new message or use again the "/away" command.
+ </p>
+ <p>
+ Note that you may send a message with the away ccommand.<br />
+ <i>For example :</i> /away I'll be back in a few minutes.
  </p>
  <p align="right"><a href="#top">Povratak na vrh</a></p>

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/lib/commands away.cmd.php3,NONE,1.1 announce.cmd.php3,1.9,1.10 banish.cmd.php3,1.11,1.12 ignore.cmd.php3,1.8,1.9 invite.cmd.php3,1.12,1.13 join.cmd.php3,1.8,1.9 kick.cmd.php3,1.5,1.6 me.cmd.php3,1.9,1.10 notify.cmd.php3,1.3,1.4 priv_msg.cmd.php3,1.6,1.7 promote.cmd.php3,1.6,1.7 quit.cmd.php3,1.7,1.8 refresh.cmd.php3,1.3,1.4 save.cmd.php3,1.5,1.6 show.cmd.php3,1.3,1.4 whois.cmd.php3,1.9,1.10

From: Lo?c C. <lo...@us...> - 2001-06-10 14:58:21

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

Modified Files:
	announce.cmd.php3 banish.cmd.php3 ignore.cmd.php3 
	invite.cmd.php3 join.cmd.php3 kick.cmd.php3 me.cmd.php3 
	notify.cmd.php3 priv_msg.cmd.php3 promote.cmd.php3 
	quit.cmd.php3 refresh.cmd.php3 save.cmd.php3 show.cmd.php3 
	whois.cmd.php3 
Added Files:
	away.cmd.php3 
Log Message:
Too many changes to detail.

--- NEW FILE ---
<?php
//
// +--------------------------------------------------------------------------+
// | phpMyChat version 0.15.0                                                 |
// +--------------------------------------------------------------------------+
// | Copyright (c) 2000-2001 The phpHeaven-team                               |
// +--------------------------------------------------------------------------+
// | License:  GNU/GPL - http://www.gnu.org/copyleft/gpl.html                 |
// +--------------------------------------------------------------------------+
// | This library does the work associated to the 'away' command.             |
// |                                                                          |
// | It is called by the 'commands.lib.php3' script.                          |
// +--------------------------------------------------------------------------+
// | From the phpMyChat project:                                              |
// |    http://www.phpheaven.net/projects/phpMyChat/                          |
// |                                                                          |
// | Authors: the phpHeaven-team <te...@ph...>                         |
// +--------------------------------------------------------------------------+
//
// $Id: away.cmd.php3,v 1.1 2001/06/10 14:57:48 loic1 Exp $
//
// The work for the 'away' command.
//



/**
 * Ensure this library is called by another of the phpMyChat scripts (fix a
 * security hole)
 */
if (!dbSessionIsRegistered('lang'))
{
	exit();
}


/**
 * Define whether the user goes away or returns back from away, then do the
 * work
 */
$dbSessionVars['away']	= 1 - $dbSessionVars['away'];
$isCommand				= true;

// The user wants a message to be send
if (!empty($cmd[2]))
{
	$cmd[2] 			= trim($cmd[2]);
	$doRefreshMessages	= true;

	// Format original message and set enhanced one (with graphical smilies)
	$originalMessage	= formatMessage($cmd[2]);
	$enhancedMessage	= $originalMessage;
	if (C_MAX_GSMILIES)
	{
		include('./lib/smilies.lib.' . C_EXTENSION);
		pmcCheckForSmilies($enhancedMessage);
		unset($smilies);
	}
	// Put the message in the 'messages' table
	$msgQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
				. '(room, username, latin1, m_time, color, msg_original, msg_enhanced) '
				. 'VALUES ('
				.	'\'' . $slashedCurrentRoomName . '\', '
				.	'\'' . $slashedNick . '\', '
				.	$latin1 . ', '
				.	time() . ', '
				.	'\'' . $color . '\', '
				.	'\'' . pmcSlashSingleQuotes($originalMessage) . '\', '
				.	'\'' . pmcSlashSingleQuotes($enhancedMessage) . '\''
				. ')';
	$dbLink->query($msgQuery);
}

// Update the 'users' and 'rooms' table
$dbLink->query("UPDATE " . C_USR_TBL . " SET away = " . $dbSessionVars['away'] . " WHERE username = '$slashedNick'");
$dbLink->query("UPDATE " . C_ROOM_TBL . " SET last_user_modif = " . time() . " WHERE room_name = '$slashedCurrentRoomName'");

?>
Index: announce.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/announce.cmd.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** announce.cmd.php3	2001/05/30 08:07:12	1.9
--- announce.cmd.php3	2001/06/10 14:57:48	1.10
***************
*** 39,43 ****
   * table
   */
! if ($dbSessionVars['status'] == 'a')
  {
  	// Format original message and set enhanced one (with graphical smilies)
--- 39,43 ----
   * table
   */
! if ($dbSessionVars['status'] == 10)
  {
  	// Format original message and set enhanced one (with graphical smilies)
***************
*** 53,64 ****
  	// Put the message in the 'messages' table
  	$msgQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  				. 'VALUES ('
! 				.	$currentRoomType . ', '
! 				.	'\'' . $slashedCurrentRoomName . '\', '
! 				.	'\'SYS announce\', '
  				.	$latin1 . ', '
  				.	time() . ', '
- 				.	'\' *\', '
  				.	'\'' . $color . '\', '
  				.	'\'' . pmcSlashSingleQuotes($originalMessage) . '\', '
--- 53,62 ----
  	// Put the message in the 'messages' table
  	$msgQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(room, username, latin1, m_time, color, msg_original, msg_enhanced) '
  				. 'VALUES ('
! 				.	"'\\\*\\\', "
! 				.	"'SYS announce', "
  				.	$latin1 . ', '
  				.	time() . ', '
  				.	'\'' . $color . '\', '
  				.	'\'' . pmcSlashSingleQuotes($originalMessage) . '\', '

Index: banish.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/banish.cmd.php3,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** banish.cmd.php3	2001/06/01 20:44:40	1.11
--- banish.cmd.php3	2001/06/10 14:57:48	1.12
***************
*** 46,50 ****
   * Ensure the current user is allowed to use the 'banish' command
   */ 
! else if ($dbSessionVars['status'] != 'a' && $dbSessionVars['status'] != 'm')
  {
  	$error = L_NO_MODERATOR;
--- 46,50 ----
   * Ensure the current user is allowed to use the 'banish' command
   */ 
! else if ($dbSessionVars['status'] < 5)
  {
  	$error = L_NO_MODERATOR;
***************
*** 64,68 ****
  	// Define an additional condition for moderators so they can only banish an
  	// user from their current room
! 	$queryRoomPart	= ($dbSessionVars['status'] == 'm')
  					? 'room = \'' . $slashedCurrentRoomName . '\' AND '
  					: '';
--- 64,68 ----
  	// Define an additional condition for moderators so they can only banish an
  	// user from their current room
! 	$queryRoomPart	= ($dbSessionVars['status'] == 5)
  					? 'room = \'' . $slashedCurrentRoomName . '\' AND '
  					: '';
***************
*** 82,87 ****
  		// Ensure the user to be banished is not a more powerfull user
  		// (admin > moderator)
! 		if ($targetStatus == 'a'
! 			|| ($targetStatus == 'm' && $dbSessionVars['status'] != 'a'))
  		{
  			$error = sprintf(L_NO_BANISHED, $cmd[2]);
--- 82,86 ----
  		// Ensure the user to be banished is not a more powerfull user
  		// (admin > moderator)
! 		if (intval($targetStatus) >= $dbSessionVars['status'])
  		{
  			$error = sprintf(L_NO_BANISHED, $cmd[2]);
***************
*** 90,95 ****
  		{
  			$targetCurrentRoom	= pmcHandleMagicQuotes($targetCurrentRoom, '', 1, 'del');
! 			if ($cmd[1] == '* ' && $dbSessionVars['status'] != 'a')
  				$cmd[1]			= '';
  
  			// Define the duration of the banishment
--- 89,96 ----
  		{
  			$targetCurrentRoom	= pmcHandleMagicQuotes($targetCurrentRoom, '', 1, 'del');
! 			if ($cmd[1] == '* ' && $dbSessionVars['status'] < 10)
! 			{
  				$cmd[1]			= '';
+ 			}
  
  			// Define the duration of the banishment
***************
*** 111,115 ****
  				if ($cmd[1] == '* ')
  				{
! 				 	$targetNewBanRooms = '*';
  				}
  				else
--- 112,116 ----
  				if ($cmd[1] == '* ')
  				{
! 				 	$targetNewBanRooms = '\\\\*\\\\';
  				}
  				else
***************
*** 121,125 ****
  					{
  						$targetNewBanRooms	= (count($tmpArray) > 2)
! 											? '*'
  											: $slashedOldBanRooms . ',' . pmcSlashSingleQuotes($targetCurrentRoom);
  					}
--- 122,126 ----
  					{
  						$targetNewBanRooms	= (count($tmpArray) > 2)
! 											? '\\\\*\\\\'
  											: $slashedOldBanRooms . ',' . pmcSlashSingleQuotes($targetCurrentRoom);
  					}
***************
*** 143,147 ****
  			{
  				$targetNewBanRooms	= ($cmd[1] == '* ')
! 									? '*'
  									: pmcSlashSingleQuotes($targetCurrentRoom);
  				$dbLink->query("INSERT INTO " . C_BAN_TBL . " (username, latin1, ip, rooms, ban_until) VALUES ('$slashedTarget', $targetLatin1, '$targetIp', '$targetNewBanRooms', '$banUntil')");
--- 144,148 ----
  			{
  				$targetNewBanRooms	= ($cmd[1] == '* ')
! 									? '\\\\*\\\\'
  									: pmcSlashSingleQuotes($targetCurrentRoom);
  				$dbLink->query("INSERT INTO " . C_BAN_TBL . " (username, latin1, ip, rooms, ban_until) VALUES ('$slashedTarget', $targetLatin1, '$targetIp', '$targetNewBanRooms', '$banUntil')");

Index: ignore.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/ignore.cmd.php3,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** ignore.cmd.php3	2001/06/01 20:44:40	1.8
--- ignore.cmd.php3	2001/06/10 14:57:48	1.9
***************
*** 110,113 ****
--- 110,121 ----
  			}
  		}
+ 		// For browsers that do not parse javascript, save a session data which
+ 		// liftetime is 1 minut to remove the cutoff used while grabbing
+ 		// messages in the 'messages' frame
+ 		if ($dbSessionVars['jsVersion'] == 'noJs'
+ 			&& $doRefreshMessages)
+ 		{
+ 			$dbSessionVars['newMsgCutoff'] = time() + 60;
+ 		}
  	}
  }

Index: invite.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/invite.cmd.php3,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** invite.cmd.php3	2001/06/01 20:44:40	1.12
--- invite.cmd.php3	2001/06/10 14:57:48	1.13
***************
*** 56,70 ****
  
  	// Prepares the messages
! 	$roomUrl	=  '$dbSessionVars[\\\'from\\\'] . \\\'?\\\' . dbSessionSID(\\\'GET\\\') . \\\'' . $pmcQueryArgSeparator . 'exitMessage=1' . $pmcQueryArgSeparator . 'newTargetRoom=' . $currentRoomType . urlencode($dbSessionVars['currentRoom']);
  	$reqRegist	= ($dbSessionVars['roomType'] == 0 && !C_REQUIRE_REGISTER)
  				? ' . \\\' \\\' . L_INVITE_REG'
  				: '';
! 	$theMessage	= 'sprintf(L_INVITE, \\\'' . $nickForNotifications . '\\\', ' . $roomUrl . '\\\', \\\'JOIN\\\', \\\'' . $currentRoomType . ' #' . $roomForJs . '\\\', \\\'' . $roomForNotifications . '\\\')'
  				. $reqRegist;
  
  	$invitedQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  					. 'VALUES ('
- 					.	$currentRoomType . ', '
  					.	'\'' . $slashedCurrentRoomName . '\', '
  					.	'\'SYS inviteTo\', '
--- 56,69 ----
  
  	// Prepares the messages
! 	$roomUrl	=  '$dbSessionVars[\\\'from\\\'] . \\\'?\\\' . dbSessionSID(\\\'GET\\\') . \\\'' . $pmcQueryArgSeparator . 'exitMessage=1' . $pmcQueryArgSeparator . 'newTargetRoom=' . $dbSessionVars['roomType'] . urlencode($dbSessionVars['currentRoom']);
  	$reqRegist	= ($dbSessionVars['roomType'] == 0 && !C_REQUIRE_REGISTER)
  				? ' . \\\' \\\' . L_INVITE_REG'
  				: '';
! 	$theMessage	= 'sprintf(L_INVITE, \\\'' . $nickForNotifications . '\\\', ' . $roomUrl . '\\\', \\\'JOIN\\\', \\\'' . $dbSessionVars['roomType'] . ' #' . $roomForJs . '\\\', \\\'' . $roomForNotifications . '\\\')'
  				. $reqRegist;
  
  	$invitedQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  					. 'VALUES ('
  					.	'\'' . $slashedCurrentRoomName . '\', '
  					.	'\'SYS inviteTo\', '
***************
*** 78,82 ****
  
  	// Get all addressee and insert a message for each one of them
- 	$currentTime		= time();
  	$invitedUsers		= explode(',', $cmd[2]);
  	$invitedUsersCnt	= count($invitedUsers);
--- 77,80 ----
***************
*** 89,93 ****
  			continue;
  		}
! 		$currentQuery		= str_replace('%TIME%', $currentTime + $i, $invitedQuery);
  		$slashedInvited		= pmcSlashSingleQuotes($invitedUsers[$i]);
  		$currentQuery		= str_replace('%ADDRESSEE%', $slashedInvited, $currentQuery);
--- 87,91 ----
  			continue;
  		}
! 		$currentQuery		= str_replace('%TIME%', time(), $invitedQuery);
  		$slashedInvited		= pmcSlashSingleQuotes($invitedUsers[$i]);
  		$currentQuery		= str_replace('%ADDRESSEE%', $slashedInvited, $currentQuery);

Index: join.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/join.cmd.php3,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** join.cmd.php3	2001/05/30 08:07:12	1.8
--- join.cmd.php3	2001/06/10 14:57:48	1.9
***************
*** 93,97 ****
  	unset($toCheck);
  	// ...neither among other rooms created by users
! 	$dbLink->query("SELECT type, room FROM " . C_MSG_TBL . " WHERE room = '$slashedTargetRoomName' LIMIT 1");
  	$roomExist = (list($trueTargetType, $trueTargetName) = $dbLink->nextRecord());
  	if ($roomExist && $targetRoomType != $trueTargetType)
--- 93,97 ----
  	unset($toCheck);
  	// ...neither among other rooms created by users
! 	$dbLink->query("SELECT room_type, room_name FROM " . C_ROOM_TBL . " WHERE room_name = '$slashedTargetRoomName' LIMIT 1");
  	$roomExist = (list($trueTargetType, $trueTargetName) = $dbLink->nextRecord());
  	if ($roomExist && $targetRoomType != $trueTargetType)
***************
*** 138,144 ****
  	{
  		// Ensure the user is a registered one
! 		if ($dbSessionVars['status'] != 'a'
! 			&& $dbSessionVars['status'] != 'm'
! 			&& $dbSessionVars['status'] != 'r')
  		{
  			$error 				= L_ERR_USR_13;
--- 138,142 ----
  	{
  		// Ensure the user is a registered one
! 		if ($dbSessionVars['status'] > 0)
  		{
  			$error 				= L_ERR_USR_13;
***************
*** 153,157 ****
  
  	// 3. Ensure the user is not banished from the room he wants to enter in
! 	if (empty($error) && C_BANISH && $dbSessionVars['status'] != 'a')
  	{
  		if (!function_exists('pmcCheckBanish'))
--- 151,155 ----
  
  	// 3. Ensure the user is not banished from the room he wants to enter in
! 	if (empty($error) && C_BANISH && $dbSessionVars['status'] < 10)
  	{
  		if (!function_exists('pmcCheckBanish'))
***************
*** 170,186 ****
  	if (empty($error))
  	{
! 		$regUserPerms			= ($dbSessionVars['status'] == 'a') ? 'admin' : 'noreg';
! 		$regUserModeratedRooms	= '';
! 		// Get data from the registered users table if required
! 		if ($regUserPerms != 'admin')
! 		{
! 			$dbLink->query("SELECT perms, rooms FROM " . C_REG_TBL . " WHERE username = '$slashedNick' LIMIT 1");
! 			$isRegUser = (list($regUserPerms, $regUserModeratedRooms) = $dbLink->nextRecord());
! 			if ($isRegUser)
! 			{
! 				$regUserModeratedRooms	= pmcHandleMagicQuotes($regUserModeratedRooms, '', 1, 'del');
! 			}
! 			$dbLink->cleanResults();
! 		}
  		if (!function_exists('pmcRightLevel'))
  		{
--- 168,173 ----
  	if (empty($error))
  	{
! 		$isRegUser				= ($dbSessionVars['status'] > 0);
! 		$nick					= $dbSessionVars['nick'];
  		if (!function_exists('pmcRightLevel'))
  		{
***************
*** 210,224 ****
  
  	// Update tables
  	$queries[]	= 'UPDATE ' . C_USR_TBL . ' '
! 				. "SET u_time = $currentTime , room = '$slashedTargetRoomName', status = '$status' "
  				. "WHERE session_id = '$dbSessionId'";
  	$queries[]	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  				. 'VALUES '
! 				. "($currentRoomType, '$slashedCurrentRoomName', 'SYS exit', '', $currentTime, NULL, '#666699', 'sprintf(L_EXIT_ROM, \'$nickForNotifications\')', 'sprintf(L_EXIT_ROM, \'$nickForNotifications\')')";
  	$queries[]	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  				. 'VALUES '
! 				. "($targetRoomType, '$slashedTargetRoomName', 'SYS enter', '', $currentTime, NULL, '#666699', 'sprintf(L_ENTER_ROM, \'$nickForNotifications\')', 'sprintf(L_ENTER_ROM, \'$nickForNotifications\')')";
  	if (C_WELCOME)
  	{
--- 197,212 ----
  
  	// Update tables
+ 	// 1. Messages and users table
  	$queries[]	= 'UPDATE ' . C_USR_TBL . ' '
! 				. "SET u_time = $currentTime , room = '$slashedTargetRoomName', status = $status "
  				. "WHERE session_id = '$dbSessionId'";
  	$queries[]	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(room, username, m_time, color, msg_original, msg_enhanced) '
  				. 'VALUES '
! 				. "('$slashedCurrentRoomName', 'SYS exit', $currentTime, '#666699', 'sprintf(L_EXIT_ROM, \'$nickForNotifications\')', 'sprintf(L_EXIT_ROM, \'$nickForNotifications\')')";
  	$queries[]	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(room, username, m_time, color, msg_original, msg_enhanced) '
  				. 'VALUES '
! 				. "('$slashedTargetRoomName', 'SYS enter', $currentTime, '#666699', 'sprintf(L_ENTER_ROM, \'$nickForNotifications\')', 'sprintf(L_ENTER_ROM, \'$nickForNotifications\')')";
  	if (C_WELCOME)
  	{
***************
*** 228,238 ****
  		include('./lib/welcome.lib.' . C_EXTENSION);
  		$slashedWelcomeMsg	= pmcSlashSingleQuotes(WELCOME_MSG);
! 		// Delete the old welcome messages sent to the current user
  		$queries[]	= 'DELETE FROM ' . C_MSG_TBL . ' '
! 					. 'WHERE username = \'SYS welcome\' AND address = \'' . $slashedNick . '\'';
  		$queries[]	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  					. 'VALUES '
! 					. "($targetRoomType, '$slashedTargetRoomName', 'SYS welcome', '', $currentTimePlus, '$slashedNick', '#666699', '$slashedWelcomeMsg', '$slashedWelcomeMsg')";
  	}
  	$queriesCnt	= count($queries);
--- 216,227 ----
  		include('./lib/welcome.lib.' . C_EXTENSION);
  		$slashedWelcomeMsg	= pmcSlashSingleQuotes(WELCOME_MSG);
! 		// Delete the old welcome messages sent to the current user (check if
! 		// m_time and rooms aren't null to enforce the use of existing indexes)
  		$queries[]	= 'DELETE FROM ' . C_MSG_TBL . ' '
! 					. "WHERE m_time != '' AND room != '' AND address = '$slashedNick' AND username = 'SYS welcome'";
  		$queries[]	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 					. '(room, username, m_time, address, color, msg_original, msg_enhanced) '
  					. 'VALUES '
! 					. "('$slashedTargetRoomName', 'SYS welcome', $currentTimePlus, '$slashedNick', '#666699', '$slashedWelcomeMsg', '$slashedWelcomeMsg')";
  	}
  	$queriesCnt	= count($queries);
***************
*** 243,248 ****
  	}
  	// Delete invitations sent to the current user for the room he is going to
! 	// enter in
! 	$dbLink->query("DELETE FROM " . C_MSG_TBL . " WHERE username = 'SYS inviteTo' AND address = '$slashedNick' AND room = '$slashedTargetRoomName'");
  
  	// Update session data and enforce a complete refresh of the
--- 232,246 ----
  	}
  	// Delete invitations sent to the current user for the room he is going to
! 	// enter in (check if m_time isn't null to enforce the use of existing
! 	// indexes)
! 	$dbLink->query("DELETE FROM " . C_MSG_TBL . " WHERE m_time != '' AND room = '$slashedTargetRoomName' AND address = '$slashedNick' AND username = 'SYS inviteTo'");
! 
! 	// 2. Rooms table
! 	$dbLink->query("UPDATE " . C_ROOM_TBL . " SET last_user_modif = $currentTime WHERE room_name = '$slashedCurrentRoomName'");
! 	$dbLink->query("UPDATE " . C_ROOM_TBL . " SET last_user_modif = $currentTime WHERE room_name = '$slashedTargetRoomName'");
! 	if ($dbLink->affectedRows() < 1)
! 	{
! 		$dbLink->query("INSERT INTO " . C_ROOM_TBL . " (room_type, room_name, last_user_modif) VALUES ($targetRoomType, '$slashedTargetRoomName', $currentTime)");
! 	}
  
  	// Update session data and enforce a complete refresh of the

Index: kick.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/kick.cmd.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** kick.cmd.php3	2001/05/30 08:07:12	1.5
--- kick.cmd.php3	2001/06/10 14:57:48	1.6
***************
*** 46,50 ****
   * Ensure the current user is allowed to use the 'kick' command
   */ 
! else if ($dbSessionVars['status'] != 'a' && $dbSessionVars['status'] != 'm')
  {
  	$error = L_NO_MODERATOR;
--- 46,50 ----
   * Ensure the current user is allowed to use the 'kick' command
   */ 
! else if ($dbSessionVars['status'] < 5)
  {
  	$error = L_NO_MODERATOR;
***************
*** 65,69 ****
  	// Define an additional condition for moderators so they can only kick an
  	// user from their current room
! 	$queryRoomPart	= ($dbSessionVars['status'] == 'm')
  					? 'room = \'' . $slashedCurrentRoomName . '\' AND '
  					: '';
--- 65,69 ----
  	// Define an additional condition for moderators so they can only kick an
  	// user from their current room
! 	$queryRoomPart	= ($dbSessionVars['status'] == 5)
  					? 'room = \'' . $slashedCurrentRoomName . '\' AND '
  					: '';
***************
*** 84,89 ****
  		// Ensure the user to be banished is not a more powerfull user
  		// (admin > moderator)
! 		if ($targetStatus == 'a'
! 			|| ($targetStatus == 'm' && $dbSessionVars['status'] != 'a'))
  		{
  			$error = sprintf(L_NO_KICKED, $cmd[1]);
--- 84,88 ----
  		// Ensure the user to be banished is not a more powerfull user
  		// (admin > moderator)
! 		if (intval($targetStatus) >= $dbSessionVars['status'])
  		{
  			$error = sprintf(L_NO_KICKED, $cmd[1]);

Index: me.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/me.cmd.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** me.cmd.php3	2001/05/30 08:07:12	1.9
--- me.cmd.php3	2001/06/10 14:57:48	1.10
***************
*** 53,64 ****
  // Put the message in the 'messages' table
  $msgQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 			. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  			. 'VALUES ('
- 			.	$currentRoomType . ', '
  			.	'\'' . $slashedCurrentRoomName . '\', '
  			.	'\'' . $slashedNick . '\', '
  			.	$latin1 . ', '
  			.	time() . ', '
- 			.	'NULL, '
  			.	'\'' . $color . '\', '
  			.	'\'' . pmcSlashSingleQuotes($originalMessage) . '\', '
--- 53,62 ----
  // Put the message in the 'messages' table
  $msgQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 			. '(room, username, latin1, m_time, color, msg_original, msg_enhanced) '
  			. 'VALUES ('
  			.	'\'' . $slashedCurrentRoomName . '\', '
  			.	'\'' . $slashedNick . '\', '
  			.	$latin1 . ', '
  			.	time() . ', '
  			.	'\'' . $color . '\', '
  			.	'\'' . pmcSlashSingleQuotes($originalMessage) . '\', '

Index: notify.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/notify.cmd.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** notify.cmd.php3	2001/04/19 21:05:04	1.3
--- notify.cmd.php3	2001/06/10 14:57:48	1.4
***************
*** 31,34 ****
--- 31,42 ----
  // cookie expires in one year
  setcookie('cookieNotify', $dbSessionVars['notify'], time() + 60*60*24*365);
+ // For browsers that do not parse javascript, save a session data which
+ // liftetime is 1 minut to remove the cutoff used while grabbing messages in
+ // the 'messages' frame
+ if ($dbSessionVars['jsVersion'] == 'noJs' && $dbSessionVars['notify'] == 0)
+ {
+ 	$dbSessionVars['newMsgCutoff'] = time() + 60;
+ }
+ 
  $isCommand					= true;
  $enforceFirstLoad			= 1;

Index: priv_msg.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/priv_msg.cmd.php3,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** priv_msg.cmd.php3	2001/05/30 08:07:12	1.6
--- priv_msg.cmd.php3	2001/06/10 14:57:48	1.7
***************
*** 67,73 ****
  	// Put the message in the 'messages' table
  	$msgQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  				. 'VALUES ('
- 				.	$currentRoomType . ', '
  				.	'\'' . $slashedCurrentRoomName . '\', '
  				.	'\'' . $slashedNick . '\', '
--- 67,72 ----
  	// Put the message in the 'messages' table
  	$msgQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  				. 'VALUES ('
  				.	'\'' . $slashedCurrentRoomName . '\', '
  				.	'\'' . $slashedNick . '\', '

Index: promote.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/promote.cmd.php3,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** promote.cmd.php3	2001/05/30 08:07:12	1.6
--- promote.cmd.php3	2001/06/10 14:57:48	1.7
***************
*** 47,51 ****
   * Ensure the current user is allowed to use the 'promote' command
   */ 
! else if ($dbSessionVars['status'] != 'a' && $dbSessionVars['status'] != 'm')
  {
  	$error = L_NO_MODERATOR;
--- 47,51 ----
   * Ensure the current user is allowed to use the 'promote' command
   */ 
! else if ($dbSessionVars['status'] < 5)
  {
  	$error = L_NO_MODERATOR;
***************
*** 61,96 ****
  else
  {
! 	$slashedTarget = pmcSlashSingleQuotes($cmd[1]);
  
  	// Ensure the user to be promoted is a registered one
! 	$dbLink->query("SELECT latin1, perms, rooms FROM " . C_REG_TBL . " WHERE username = '$slashedTarget' LIMIT 1");
! 	$isReg = (list($targetLatin1, $targetPerms, $targetModeratedRooms) = $dbLink->nextRecord());
  	if ($isReg)
  	{
! 		$targetModeratedRooms	= pmcHandleMagicQuotes($targetModeratedRooms, '', 1, 'del');
! 		$slashedModeratedRooms	= pmcSlashSingleQuotes($targetModeratedRooms);
! 		$isCommand				= true;
  		// Promote the user if he/she is not administrator or already moderator
  		// for the current room
! 		if ($targetPerms == 'admin')
  		{
  			$error = sprintf(L_ADMIN, $cmd[1]);
  		}
! 		else if (pmcIsInto($dbSessionVars['currentRoom'], $targetModeratedRooms) < 0)
  		{
  			$doRefreshMessages		= true;
- 			$slashedModeratedRooms	.= ($slashedModeratedRooms == '')
- 									? $slashedCurrentRoomName
- 									: ',' . $slashedCurrentRoomName;
  			$targetForNotifications	= pmcSlashSingleQuotes(pmcSpecialChars($slashedTarget, $targetLatin1), 2);
  
! 			$dbLink->query("UPDATE " . C_REG_TBL . " SET perms = 'moderator', rooms = '$slashedModeratedRooms' WHERE username = '$slashedTarget'");
! 			$dbLink->query("UPDATE " . C_USR_TBL . " SET status = 'm' WHERE username = '$slashedTarget' AND room = '$slashedCurrentRoomName'");
  			$msgQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 						. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  						. 'VALUES ('
! 						. "$currentRoomType, '$slashedCurrentRoomName', 'SYS promote', $latin1, " . time() . ", NULL, '#666699', 'sprintf(L_MODERATOR, \'$targetForNotifications\')', 'sprintf(L_MODERATOR, \'$targetForNotifications\')'"
  						. ')';
  			$dbLink->query($msgQuery);
  		}
  		else
--- 61,99 ----
  else
  {
! 	$slashedTarget	= pmcSlashSingleQuotes($cmd[1]);
! 	$slashedRoom	= pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
  
  	// Ensure the user to be promoted is a registered one
! 	$dbLink->query("SELECT charset FROM " . C_REG_TBL . " WHERE username = '$slashedTarget' LIMIT 1");
! 	$isReg = (list($targetCharset) = $dbLink->nextRecord());
! 	$dbLink->cleanResults();
  	if ($isReg)
  	{
! 		$targetLatin1	= ($targetCharset == 'iso-8859-1') ? 1 : 0;
! 		$isCommand		= true;
  		// Promote the user if he/she is not administrator or already moderator
  		// for the current room
! 		$dbLink->query("SELECT right_level FROM " . C_RIGHT_TBL . " WHERE username = '$slashedTarget' AND room IN ('$slashedRoom', '') LIMIT 1");
! 		list($targetPerms) = $dbLink->nextRecord();
! 		$dbLink->cleanResults();
! 		if ($targetPerms == 10)
  		{
  			$error = sprintf(L_ADMIN, $cmd[1]);
  		}
! 		else if (empty($targetPerms))
  		{
  			$doRefreshMessages		= true;
  			$targetForNotifications	= pmcSlashSingleQuotes(pmcSpecialChars($slashedTarget, $targetLatin1), 2);
+ 			$promoteTime			= time();
  
! 			$dbLink->query("INSERT INTO " . C_RIGHT_TBL . " (username, room, right_level) VALUES ('$slashedTarget', '$slashedRoom', 5)");
! 			$dbLink->query("UPDATE " . C_USR_TBL . " SET status = 5 WHERE username = '$slashedTarget' AND room = '$slashedCurrentRoomName'");
  			$msgQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 						. '(room, username, m_time, color, msg_original, msg_enhanced) '
  						. 'VALUES ('
! 						. "'$slashedCurrentRoomName', 'SYS promote', $promoteTime, '#666699', 'sprintf(L_MODERATOR, \'$targetForNotifications\')', 'sprintf(L_MODERATOR, \'$targetForNotifications\')'"
  						. ')';
  			$dbLink->query($msgQuery);
+ 			$dbLink->query("UPDATE " . C_ROOM_TBL . " SET last_user_modif = $promoteTime WHERE room_name = '$slashedCurrentRoomName'");
  		}
  		else

Index: quit.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/quit.cmd.php3,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** quit.cmd.php3	2001/05/30 08:07:12	1.7
--- quit.cmd.php3	2001/06/10 14:57:48	1.8
***************
*** 55,66 ****
  
  	$msgQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(type, room, username, latin1, m_time, address, color, msg_original, msg_enhanced) '
  				. 'VALUES ('
- 				.	$currentRoomType . ', '
  				.	'\'' . $slashedCurrentRoomName . '\', '
  				.	'\'' . $slashedNick . '\', '
  				.	$latin1 . ', '
  				.	time() . ', '
- 				.	'NULL, '
  				.	'\'' . $color . '\', '
  				.	'\'' . pmcSlashSingleQuotes($originalMessage) . '\', '
--- 55,64 ----
  
  	$msgQuery	= 'INSERT INTO ' . C_MSG_TBL . ' '
! 				. '(room, username, latin1, m_time, color, msg_original, msg_enhanced) '
  				. 'VALUES ('
  				.	'\'' . $slashedCurrentRoomName . '\', '
  				.	'\'' . $slashedNick . '\', '
  				.	$latin1 . ', '
  				.	time() . ', '
  				.	'\'' . $color . '\', '
  				.	'\'' . pmcSlashSingleQuotes($originalMessage) . '\', '

Index: refresh.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/refresh.cmd.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** refresh.cmd.php3	2001/04/19 21:05:04	1.3
--- refresh.cmd.php3	2001/06/10 14:57:48	1.4
***************
*** 36,39 ****
--- 36,45 ----
  	$dbSessionVars['refreshDelay'] = ($dbSessionVars['refreshDelay'] == 0) ? C_MSG_REFRESH : 0;
  }
+ 
+ if ($dbSessionVars['jsVersion'] == 'noJs' && $dbSessionVars['refreshDelay'] > 0)
+ {
+ 	$htmlPopupLink	= '<a href="./messages_low.' . C_EXTENSION . '?' . dbSessionSID('GET') . '" target="messages">Refresh ' . $dbSessionVars['refreshDelay'] . '</a>';
+ }
+ 
  $isCommand					= true;
  $doRefreshMessages			= true;

Index: save.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/save.cmd.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** save.cmd.php3	2001/05/30 08:07:12	1.5
--- save.cmd.php3	2001/06/10 14:57:48	1.6
***************
*** 43,63 ****
  // Define the SQL query (it depends on the ignored users list and on whether to
  // display notification messages or not)
! $ignoredSendersList		 = '(';
  if (dbSessionIsRegistered('ignoredSenders') && !empty($dbSessionVars['ignoredSenders']))
  	$ignoredSendersList	.= '\''
  						 . str_replace(',', '\', \'', pmcSlashSingleQuotes($dbSessionVars['ignoredSenders']))
  						 . '\'';
! if ($ignoredSendersList != '(')
! 	$ignoredSendersList	 = 'username NOT IN (' . $ignoredSendersList . ') AND ';
! $ignoredSendersList		.= 'username NOT LIKE \'SYS %\') AND ';
  
  $getMessagesQuery		 = 'SELECT COUNT(*) FROM ' . C_MSG_TBL . ' '
  						 . 'WHERE '
! 						 .	$ignoredSendersList
! 						 .	'('
! 						 .		'address = \' *\' OR '
! 						 .		'(address = \'' . $slashedNick .'\' AND (room = \'' . $slashedCurrentRoomName . '\' OR username = \'SYS inviteTo\')) OR '
! 						 .		'(room = \'' . $slashedCurrentRoomName . '\' AND (address IS NULL OR username = \''. $slashedNick . '\'))'
! 						 .	') '
  						 . 'LIMIT 1';
  
--- 43,62 ----
  // Define the SQL query (it depends on the ignored users list and on whether to
  // display notification messages or not)
! $ignoredSendersList		 = ' AND (';
  if (dbSessionIsRegistered('ignoredSenders') && !empty($dbSessionVars['ignoredSenders']))
  	$ignoredSendersList	.= '\''
  						 . str_replace(',', '\', \'', pmcSlashSingleQuotes($dbSessionVars['ignoredSenders']))
  						 . '\'';
! if ($ignoredSendersList != ' AND (')
! 	$ignoredSendersList	 = ' username NOT IN (' . $ignoredSendersList . ') AND ';
! $ignoredSendersList		.= ' username NOT LIKE \'SYS %\')';
  
  $getMessagesQuery		 = 'SELECT COUNT(*) FROM ' . C_MSG_TBL . ' '
  						 . 'WHERE '
! 						 	. "room IN ('$slashedCurrentRoomName', '\\\*\\\') AND "
! 						 	. '('
! 						 	.	"(address != '' AND username = '$slashedNick') OR "
! 						 	.	"((address = '' OR address = '$slashedNick')$ignoredSendersList)"
! 						 	. ') '
  						 . 'LIMIT 1';
  

Index: show.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/show.cmd.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** show.cmd.php3	2001/04/19 21:05:04	1.3
--- show.cmd.php3	2001/06/10 14:57:48	1.4
***************
*** 28,31 ****
--- 28,39 ----
   * Just modify some variables
   */
+ // For browsers that do not parse javascript, save a session data which
+ // liftetime is 1 minut to remove the cutoff used while grabbing messages in
+ // the 'messages' frame
+ if ($dbSessionVars['jsVersion'] == 'noJs'
+ 	&& (isset($cmd[3]) && $cmd[3] > $dbSessionVars['msgNumber']))
+ {
+ 	$dbSessionVars['newMsgCutoff'] = time() + 60;
+ }
  $dbSessionVars['msgNumber'] = ($cmd[3] != '') ? max(abs($cmd[3]), 5) : 5;
  $isCommand					= true;

Index: whois.cmd.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/whois.cmd.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** whois.cmd.php3	2001/06/01 20:44:40	1.9
--- whois.cmd.php3	2001/06/10 14:57:48	1.10
***************
*** 60,64 ****
  	if (!$isProfile)
  	{
! 		if ($dbSessionVars['status'] == 'a' || $dbSessionVars['nick'] == $cmd[1])
  		{
  			$dbLink->query("SELECT ip FROM " . C_USR_TBL . " WHERE username='" . $slashedTarget . "' LIMIT 1");
--- 60,64 ----
  	if (!$isProfile)
  	{
! 		if ($dbSessionVars['status'] == 10 || $dbSessionVars['nick'] == $cmd[1])
  		{
  			$dbLink->query("SELECT ip FROM " . C_USR_TBL . " WHERE username='" . $slashedTarget . "' LIMIT 1");

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/lib check_and_kick_user.lib.php3,1.15,1.16 clean.lib.php3,1.4,1.5 commands.lib.php3,1.9,1.10 common.lib.php3,1.10,1.11 format_messages.lib.php3,1.10,1.11 gen_password.lib.php3,1.3,1.4 get_user_infos.lib.php3,1.2,1.3 login.lib.js,1.3,1.4 login.lib.php3,1.9,1.10 profile_work.lib.js,1.4,1.5 upgrades.lib.php3,1.5,1.6

From: Lo?c C. <lo...@us...> - 2001-06-10 14:58:21

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

Modified Files:
	check_and_kick_user.lib.php3 clean.lib.php3 commands.lib.php3 
	common.lib.php3 format_messages.lib.php3 gen_password.lib.php3 
	get_user_infos.lib.php3 login.lib.js login.lib.php3 
	profile_work.lib.js upgrades.lib.php3 
Log Message:
Too many changes to detail.

Index: check_and_kick_user.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/check_and_kick_user.lib.php3,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** check_and_kick_user.lib.php3	2001/05/22 20:40:34	1.15
--- check_and_kick_user.lib.php3	2001/06/10 14:57:47	1.16
***************
*** 42,46 ****
   * @global	array	the session data
   * @global	string	the slashed nick of the current user
-  * @global	integer	the type of the current room
   * @global	string	the slashed name of the current room
   */
--- 42,45 ----
***************
*** 51,60 ****
  	global $dbSessionVars;
  	global $slashedNick;
- 	global $currentRoomType;
  	global $slashedCurrentRoomName;
  
! 	$checkLink = new pmcDB;
! 	$checkLink->query("SELECT room, status FROM " . C_USR_TBL . " WHERE username = '$slashedNick' LIMIT 1");
! 	$isLoggedIn = (list($loggedInRoom, $status) = $checkLink->nextRecord());
  	$checkLink->cleanResults();
  
--- 50,59 ----
  	global $dbSessionVars;
  	global $slashedNick;
  	global $slashedCurrentRoomName;
  
! 	$updTime	= time();
! 	$checkLink	= new pmcDB;
! 	$checkLink->query("SELECT u_time, room, status, away FROM " . C_USR_TBL . " WHERE username = '$slashedNick' LIMIT 1");
! 	$isLoggedIn	= (list($lastPost, $loggedInRoom, $status, $away) = $checkLink->nextRecord());
  	$checkLink->cleanResults();
  
***************
*** 87,90 ****
--- 86,95 ----
  		}
  
+ 		// Inactive for a too long time
+ 		else if ($status == 'i')
+ 		{
+ 			$dbSessionVars['kicked'] = 5;
+ 		}
+ 
  		// Do exit from the current room if required
  		if (!empty($dbSessionVars['kicked']))
***************
*** 102,113 ****
  		else
  		{
! 			// ... the status if it has been modified
! 			if ($dbSessionVars['status'] != $status)
  			{
! 				$dbSessionVars['status']	= $status;
  			}
- 			// ... the time to ensure the user won't be cleaned from the
- 			// connected users table
- 			$checkLink->query("UPDATE " . C_USR_TBL . " SET u_time = " . time() . " WHERE session_id = '$dbSessionId'");
  		}
  	} // end the case where the user has been found
--- 107,129 ----
  		else
  		{
! 			// ... the status and the away selector
! 			$dbSessionVars['status']	= $status;
! 			$dbSessionVars['away']		= $away;
! 			// ... the time to ensure the user won't be cleaned from the
! 			// connected users table except if the user is 'away' or this
! 			// library is not called because he has sent a message
! 			if ($doUpdate)
  			{
! 				if ($away == 1)
! 				{
! 					$dbSessionVars['away']		= 0;
! 					$checkLink->query("UPDATE " . C_USR_TBL . " SET u_time = $updTime, away = 0 WHERE session_id = '$dbSessionId'");
! 					$checkLink->query("UPDATE " . C_ROOM_TBL . " SET last_user_modif = $updTime WHERE room_name = '$slashedCurrentRoomName'");
! 				}
! 				else
! 				{
! 					$checkLink->query("UPDATE " . C_USR_TBL . " SET u_time = $updTime WHERE session_id = '$dbSessionId'");
! 				}
  			}
  		}
  	} // end the case where the user has been found
***************
*** 122,129 ****
  					. '(session_id, u_time, room, username, latin1, status, ip) '
  					. 'VALUES ('
! 					. "'$dbSessionId', " . time() . ", '$slashedCurrentRoomName', '$slashedNick', '$latin1', '" . $dbSessionVars['status'] . "', '$ip'"
  					. ')';
  		$checkLink->query($usrQuery);
  	} // end of the case where user should be in users table
  
  // The db link should be closed but this can't be done under Apache because
--- 138,159 ----
  					. '(session_id, u_time, room, username, latin1, status, ip) '
  					. 'VALUES ('
! 					. "'$dbSessionId', $updTime, '$slashedCurrentRoomName', '$slashedNick', '$latin1', " . $dbSessionVars['status'] . ", '$ip'"
  					. ')';
  		$checkLink->query($usrQuery);
+ 		$checkLink->query("UPDATE " . C_ROOM_TBL . " SET last_user_modif = $updTime WHERE room_name = '$slashedCurrentRoomName'");
  	} // end of the case where user should be in users table
+ 
+ 	// The user doesn't exists in the connected users table -> leave the chat
+ 	else
+ 	{
+ 		$dbSessionVars['kicked']	= 5;
+ 		dbSessionSave();
+ 		$exitUrl					= $dbSessionVars['from']
+ 									. '?' . dbSessionSID('GET')
+ 									. $GLOBALS['pmcQueryArgSeparator'] . 'exitMessage=1';
+ 		$checkLink->close();
+ 		include('./lib/move_to_start.lib.' . C_EXTENSION);
+ 		exit();
+ 	} // end of unknown user -> leave the chat
  
  // The db link should be closed but this can't be done under Apache because

Index: clean.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/clean.lib.php3,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** clean.lib.php3	2001/04/19 21:05:04	1.4
--- clean.lib.php3	2001/06/10 14:57:47	1.5
***************
*** 25,32 ****
  
  
! $chatClean = new pmcDB;
! $chatClean->query("DELETE FROM " . C_MSG_TBL . " WHERE m_time < " . (time() - C_MSG_DEL * 60 * 60));
! $chatClean->query("DELETE FROM " . C_USR_TBL . " WHERE u_time < " . (time() - C_USR_DEL * 60) . " OR (status = 'k' AND u_time <  " . (time() - 20) . ")");
! $isUsrCleaned = ($chatClean->affectedRows() > 0);
  $chatClean->close();
  ?>
--- 25,75 ----
  
  
! $delTime		= time();
! $chatClean 		= new pmcDB;
! 
! /**
!  * Update the connected users and the rooms table
!  */
! // Get the list of the rooms that will be updated
! $updatedRooms	= '';
! $updQueryClause	= '(u_time < ' . ($delTime - C_USR_AWAY * 60) . ' AND status != \'i\' AND away != 1)'
! 				. ' OR (u_time < ' . ($delTime - 20) . ' AND status IN (\'k\', \'b\'))'
! 				. ' OR u_time < ' . ($delTime - (C_USR_AWAY + C_USR_DEL) * 60 - 20);
! $chatClean->query("SELECT room FROM " . C_USR_TBL . " WHERE $updQueryClause");
! while (list($tmp) = $chatClean->nextRecord())
! {
! 	$updatedRooms	.= (empty($updatedRooms))
! 					? "'" . pmcSlashSingleQuotes(pmcHandleMagicQuotes($tmp, '', 1, 'del')) . "'"
! 					: ", '" . pmcSlashSingleQuotes(pmcHandleMagicQuotes($tmp, '', 1, 'del')) . "'";
! }
! $chatClean->cleanResults();
! 
! if (!empty($updatedRooms))
! {
! 	// Modify the 'away' status of users that do not send any message since
! 	// C_USR_AWAY minuts
! 	$chatClean->query("UPDATE " . C_USR_TBL . " SET away = 1 WHERE u_time < " . ($delTime - C_USR_AWAY * 60) . " AND away != 1");
! 
! 	// Modify the status of users "away from their keyboards" that do not send
! 	// any message since C_USR_AWAY + C_USR_DEL minuts
! 	$chatClean->query("UPDATE " . C_USR_TBL . " SET status = 'i' WHERE u_time < " . ($delTime - (C_USR_AWAY + C_USR_DEL) * 60) . " AND status != 'i'");
! 
! 	$delFromUsr		= '(u_time < ' . ($delTime - 20) . ' AND status IN (\'k\', \'b\'))'
! 					. ' OR u_time < ' . ($delTime - (C_USR_AWAY + C_USR_DEL) * 60 - 20);
! 	$chatClean->query("DELETE FROM " . C_USR_TBL . " WHERE $delFromUsr");
! 	$isUsrCleaned	= ($chatClean->affectedRows() > 0);
! 	$chatClean->query("UPDATE " . C_ROOM_TBL . " SET last_user_modif = $delTime WHERE room_name IN ($updatedRooms)");
! }
! else
! {
! 	$isUsrCleaned	= false;
! }
! 
! 
! /**
!  * Clean the messages and the rooms tables
!  */
! $chatClean->query("DELETE FROM " . C_MSG_TBL . " WHERE m_time < " . ($delTime - C_MSG_DEL * 60 * 60));
! $chatClean->query("DELETE FROM " . C_ROOM_TBL . " WHERE last_user_modif < " . ($delTime - ((C_MSG_DEL + 1) * 60 * 60)));
  $chatClean->close();
  ?>

Index: commands.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands.lib.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** commands.lib.php3	2001/06/01 20:44:40	1.9
--- commands.lib.php3	2001/06/10 14:57:47	1.10
***************
*** 47,50 ****
--- 47,54 ----
  	include('./lib/commands/announce.cmd.' . C_EXTENSION);
  }
+ else if (eregi('^\/away([[:space:]](.+))?$', $message, $cmd))
+ {
+ 	include('./lib/commands/away.cmd.' . C_EXTENSION);
+ }
  else if (C_BANISH
  		&& eregi('^\/ban[[:space:]](\*[[:space:]])?(.{1,30})$', $message, $cmd))

Index: common.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/common.lib.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** common.lib.php3	2001/04/29 10:44:55	1.10
--- common.lib.php3	2001/06/10 14:57:47	1.11
***************
*** 52,56 ****
  if ($pmcIsPhp4)
  {
! 	$pmcQueryArgSeparator	= (@ini_get('arg_separator')) ? @ini_get('arg_separator') : '&';
  }
  else
--- 52,67 ----
  if ($pmcIsPhp4)
  {
! 	if (@ini_get('arg_separator.output')) // php 4.06+
! 	{
! 		$pmcQueryArgSeparator	= ini_get('arg_separator.output');
! 	}
! 	else if (@ini_get('arg_separator')) // php4.05
! 	{
! 		$pmcQueryArgSeparator	= ini_get('arg_separator');
! 	}
! 	else
! 	{
! 		$pmcQueryArgSeparator	= '&';
! 	}
  }
  else

Index: format_messages.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/format_messages.lib.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** format_messages.lib.php3	2001/06/01 20:44:40	1.10
--- format_messages.lib.php3	2001/06/10 14:57:47	1.11
***************
*** 42,46 ****
  	// Red colors are reserved to the admin or a moderator for the current room
  	if ((ereg('#(FF0000|fc403f|fc4b34|fa582a|f66421|f27119|ec7e11|ec117f|f21971|f62164|fa2a58|fc344b)', $theColor))
! 		&& !($dbSessionVars['status'] == 'a' || $dbSessionVars['status'] == 'm'))
  	{
  		$theColor = '#000000';
--- 42,46 ----
  	// Red colors are reserved to the admin or a moderator for the current room
  	if ((ereg('#(FF0000|fc403f|fc4b34|fa582a|f66421|f27119|ec7e11|ec117f|f21971|f62164|fa2a58|fc344b)', $theColor))
! 		&& $dbSessionVars['status'] < 5)
  	{
  		$theColor = '#000000';

Index: gen_password.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/gen_password.lib.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** gen_password.lib.php3	2001/04/19 21:05:04	1.3
--- gen_password.lib.php3	2001/06/10 14:57:47	1.4
***************
*** 46,50 ****
   * @access	private
   */
! function genPassword()
  {
  	// set ASCII range for random character generation
--- 46,50 ----
   * @access	private
   */
! function pmcGenPassword()
  {
  	// set ASCII range for random character generation
***************
*** 71,75 ****
  
  	return $password;
! } // end of the 'genPassword()' function
  
  ?>
--- 71,75 ----
  
  	return $password;
! } // end of the 'pmcGenPassword()' function
  
  ?>

Index: get_user_infos.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/get_user_infos.lib.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** get_user_infos.lib.php3	2001/05/23 21:40:30	1.2
--- get_user_infos.lib.php3	2001/06/10 14:57:48	1.3
***************
*** 140,186 ****
  	$dbLink->query("DELETE FROM " . C_BAN_TBL . " WHERE ban_until < " . time());
  
! 	// 1. Search by nick
! 	$dbLink->query("SELECT ip, rooms FROM " . C_BAN_TBL . " WHERE username = '$slashedNick' LIMIT 1");
! 	// This nick is banished from some rooms
! 	if (list($oldIp, $banishedFromRooms) = $dbLink->nextRecord())
  	{
  		$dbLink->cleanResults();
! 		$banishedFromRooms = pmcHandleMagicQuotes($banishedFromRooms, '', 1, 'del');
! 		// Is the user banished from the room he wants to enter in?
! 		$isBanished	= ($banishedFromRooms == '*' || pmcIsInto($targetRoom, $banishedFromRooms) >= 0);
! 		// If the user is banished, update his/her ip in the banished table if
! 		// necessary
! 		if ($isBanished
! 			&& $ip != $oldIp
! 			&& (substr($ip, 0, 1) != 'p' || substr($oldIp, 0, 1) == 'p'))
  		{
! 			$dbLink->query("UPDATE " . C_BAN_TBL . " SET ip = '$ip' WHERE username = '$slashedNick'");
! 		}
! 	} // end of the case where nick is banished from some rooms
! 
! 	// 2. This nick isn't banished from any room, seek for a banished IP
  	else
  	{
  		$dbLink->cleanResults();
! 		$dbLink->query("SELECT rooms, ban_until FROM " . C_BAN_TBL . " WHERE ip = '$ip' LIMIT 1");
! 		// Ip is banished from some rooms
! 		if (list($banishedFromRooms, $banUntil) = $dbLink->nextRecord())
! 		{
! 			$dbLink->cleanResults();
! 			$banishedFromRooms = pmcHandleMagicQuotes($banishedFromRooms, '', 1, 'del');
! 			// Is the ip banished from the room user wants to enter in?
! 			$isBanished	= ($banishedFromRooms == '*' || pmcIsInto($targetRoom, $banishedFromRooms) >= 0);
! 			// If the user is banished, add his/her nick to the banished users
! 			// table if necessary
! 			if ($isBanished)
! 			{
! 				$dbLink->query("INSERT INTO " . C_BAN_TBL . " (username, latin1, ip, rooms, ban_until) VALUES ('$slashedNick', " . $GLOBALS['latin1'] . ", '$ip', '" . pmcSlashSingleQuotes($banishedFromRooms) . "', '$banUntil')");
! 			}
! 		} // end of the case where IP is banished from some rooms
! 		else
! 		{
! 			$dbLink->cleanResults();
! 		}
! 	} // end of ip tests
  
  	return $isBanished;
--- 140,193 ----
  	$dbLink->query("DELETE FROM " . C_BAN_TBL . " WHERE ban_until < " . time());
  
! 	// Search if the user is banished from the room he/she wants to enter in
! 	// and update banished table if necessary
! 	$parts	= explode('.', $ip);
! 	$ipList	= "'$ip', "
! 			. "'$parts[0].$parts[1].$parts[2].255', "
! 			. "'$parts[0].$parts[1].255.255', "
! 			. "'$parts[0].255.255.255'";
! 	unset($parts);
! 	$dbLink->query("SELECT username, ip, rooms, ban_until FROM " . C_BAN_TBL . " WHERE username = '$slashedNick' OR ip IN ($ipList) LIMIT 1");
! 	// The user or the ip is banished from some rooms
! 	if (list($oldNick, $oldIp, $banishedFromRooms, $banUntil) = $dbLink->nextRecord())
  	{
  		$dbLink->cleanResults();
! 		$oldNick			= pmcSlashSingleQuotes(pmcHandleMagicQuotes($oldNick, '', 1, 'del'));
! 		$banishedFromRooms	= pmcHandleMagicQuotes($banishedFromRooms, '', 1, 'del');
! 		// Is the user/ip banished from the room he wants to enter in?
! 		$isBanished			= ($banishedFromRooms == '\\*\\' || pmcIsInto($targetRoom, $banishedFromRooms) >= 0);
! 		// If the user/ip is banished, update his/her useranme or ip in the
! 		// banished table if necessary
! 		if ($isBanished)
  		{
! 			// Username and ip are already associated -> do nothing
! 			if ($oldNick == $slashedNick && $oldIp == $ip)
! 			{
! 				// Void
! 			}
! 			// Ip not associated with the current username -> update table
! 			else if ($oldNick != $slashedNick)
! 			{
! 				
! 				$banishedFromRooms	= ($banishedFromRooms == '\\*\\')
! 									? '\\\\*\\\\'
! 									: pmcSlashSingleQuotes($banishedFromRooms);
! 				$dbLink->query("INSERT INTO " . C_BAN_TBL . " (username, latin1, ip, rooms, ban_until) VALUES ('$slashedNick', " . $GLOBALS['latin1'] . ", '$ip', '$banishedFromRooms', '$banUntil')");
! 			}
! 			// Username not associated with the current ip -> update table if
! 			// necessary
! 			else
! 			{
! 				if (substr($oldIp, 0, 1) == 'p' || substr($ip, 0, 1) != 'p')
! 				{
! 					$dbLink->query("UPDATE " . C_BAN_TBL . " SET ip = '$ip' WHERE username = '$slashedNick'");
! 				}
! 			}
! 		} // end of the case where user/ip is banished from the target room
! 	} // end of the case where user/ip is banished from some rooms
  	else
  	{
  		$dbLink->cleanResults();
! 	}
  
  	return $isBanished;
***************
*** 194,202 ****
   * library
   *
!  * @return	string	the right level of the user
   *
   * @global	boolean	whether the user is a registered one or not
-  * @global	string	the global right level of this user
-  * @global	string	the list of rooms moderated by this user
   * @global	string	the slashed nick of the user
   * @global	boolean	whether the room has to be trully created or not
--- 201,208 ----
   * library
   *
!  * @return	integer	the right level of the user
   *
+  * @global	array	the session data
   * @global	boolean	whether the user is a registered one or not
   * @global	string	the slashed nick of the user
   * @global	boolean	whether the room has to be trully created or not
***************
*** 209,215 ****
  function pmcRightLevel()
  {
  	global $isRegUser;
- 	global $regUserPerms;
- 	global $regUserModeratedRooms;
  	global $slashedNick;
  	global $isCreateRoom;
--- 215,220 ----
  function pmcRightLevel()
  {
+ 	global $dbSessionVars;
  	global $isRegUser;
  	global $slashedNick;
  	global $isCreateRoom;
***************
*** 218,303 ****
  	global $dbLink;
  
! 	// 1. The user is the administrator
! 	if ($regUserPerms == 'admin')
  	{
! 		return 'a';
  	}
! 	// 2. The user is already moderator for the room he/she will enter in
! 	else if ($regUserPerms == 'moderator'
! 			 && pmcIsInto($targetRoom, $regUserModeratedRooms) >= 0)
  	{
! 		return 'm';
  	}
! 	// 3. The room has to be created...
! 	if ($isCreateRoom)
  	{
! 		// If the name of the room to be created is the same than one of an
! 		// existing room containing 'true' messages (not only notifications of
! 		// users entrance/exit) or containing only 'system' message but an user
! 		// is currently logged in, status will be 'user'
! 		$dbLink->query("SELECT COUNT(*) FROM " . C_MSG_TBL . " WHERE room = '$slashedTargetRoomName' AND username NOT LIKE 'SYS %' LIMIT 1");
! 		list($isTrueMsg)	= $dbLink->nextRecord();
! 		$regUserPerms		= ($isTrueMsg == 0) ? 'moderator' : 'user';
  		$dbLink->cleanResults();
! 		if (!$isTrueMsg)
  		{
! 			$dbLink->query("SELECT COUNT(*) FROM " . C_USR_TBL . " WHERE room = '$slashedTargetRoomName' AND username != '$slashedNick' LIMIT 1");
! 			list($isAnybody)	= $dbLink->nextRecord();
! 			$regUserPerms		= ($isAnybody == 0) ? 'moderator' : 'user';
! 			$dbLink->cleanResults();
! 		} // end of true new room
! 
! 		// The user will be moderator for this room -> update tables
! 		if ($regUserPerms == 'moderator')
  		{
! 			// If an other registered user is already moderator for the room to
! 			// create but there is no 'true' message in this room then sets his
! 			// status to 'user' for this room
! 			$dbLink->query("SELECT username, rooms FROM " . C_REG_TBL . " WHERE perms = 'moderator' AND username != '$slashedNick'");
! 			while (list($otherModerator, $otherModeratedRooms) = $dbLink->nextRecord())
  			{
! 				$changed				= false;
! 				$otherModerator			= pmcHandleMagicQuotes($otherModerator, '', 1, 'del');
! 				$otherModeratedRooms	= pmcHandleMagicQuotes($otherModeratedRooms, '', 1, 'del');
! 				$rooms					= explode(',', $otherModeratedRooms);
! 				$arrayCnt				= count($rooms);
! 				reset($rooms);
! 				for ($i = 0; $i < $arrayCnt; $i++)
! 				{
! 					if (strcasecmp($targetRoom, $rooms[$i]) == 0)
! 					{
! 						$rooms[$i]	= '';
! 						$changed	= true;
! 						break;
! 					}
! 				}
! 				if ($changed)
! 				{
! 					$otherModeratedRooms = implode(',', $rooms);
! 					$otherModeratedRooms = ereg_replace('^,|,$', '', $otherModeratedRooms);
! 					$otherModeratedRooms = str_replace(',,', ',', $otherModeratedRooms);
! 					$dbLink->query("UPDATE " . C_REG_TBL . " SET rooms = '" . pmcSlashSingleQuotes($otherModeratedRooms) . "' WHERE username = '" . pmcSlashSingleQuotes($otherModerator) . "'");
! 					$dbLink->query("UPDATE " . C_USR_TBL . " SET status = 'r' WHERE room = '$slashedTargetRoomName' AND username = '" . pmcSlashSingleQuotes($otherModerator) . "'");
! 				}
! 				unset($rooms);
! 			}
! 			// Update the current user status for the room to be created
! 			$regUserModeratedRooms	.= (empty($regUserModeratedRooms))
! 									? $targetRoom
! 									: ',' . $targetRoom;
! 			$dbLink->query("UPDATE " . C_REG_TBL . " SET perms = 'moderator', rooms = '" . pmcSlashSingleQuotes($regUserModeratedRooms) ."' WHERE username = '$slashedNick'");
! 
! 			return 'm';
! 		} // end of updating tables
! 		else
! 		{
! 			return 'r';
! 		}
! 	}
! 	// 4. Other cases
! 	else
! 	{
! 		return ($isRegUser) ? 'r' : 'u';
! 	}
  } // end of the 'pmcRightLevel()' function
  	
--- 223,287 ----
  	global $dbLink;
  
! 	// 1. The user is not a registered one
! 	if (!$isRegUser)
  	{
! 		return 0;
  	}
! 	// 2. The user is the administrator
! 	else if ((dbSessionIsRegistered('nick') && $dbSessionVars['nick'] == $GLOBALS['pmcNick'])
! 			 && (dbSessionIsRegistered('status') && $dbSessionVars['status'] == 10))
  	{
! 		return 10;
  	}
! 	// 3. Other cases
! 	else
  	{
! 		// 3.1 Get the right level of the user for the room he is going to
! 		//     enter in from the db
! 		$dbLink->query("SELECT right_level FROM " . C_RIGHT_TBL . " WHERE username = '$slashedNick' AND room IN ('$slashedTargetRoomName', '') LIMIT 1");
! 		list($theRightLevel) = $dbLink->nextRecord();
  		$dbLink->cleanResults();
! 		// Administrator or moderator cases
! 		if (!empty($theRightLevel))
  		{
! 			return $theRightLevel;
! 		}
! 		// Simple registered user case and room already exists
! 		else if (!$isCreateRoom)
  		{
! 			return 1;
! 		} // end of 3.1
! 
! 		// 3.2 Room has to be created -> define right level if the user isn't
! 		//     yet moderator for it
! 		if ($isCreateRoom)
! 		{
! 			// If the name of the room to be created is the same than one of an
! 			// existing room containing 'true' messages (not only notifications
! 			// users entrance/exit) or containing only 'system' message but an
! 			// user is currently logged in, status will be 'user'
! 			$dbLink->query("SELECT COUNT(*) FROM " . C_MSG_TBL . " WHERE room = '$slashedTargetRoomName' AND username NOT LIKE 'SYS %' LIMIT 1");
! 			list($isTrueMsg)		= $dbLink->nextRecord();
! 			$tmpUserPerm			= ($isTrueMsg == 0) ? 5 : 1;
! 			$dbLink->cleanResults();
! 			if (!$isTrueMsg)
  			{
! 				$dbLink->query("SELECT COUNT(*) FROM " . C_USR_TBL . " WHERE room = '$slashedTargetRoomName' AND username != '$slashedNick' LIMIT 1");
! 				list($isAnybody)	= $dbLink->nextRecord();
! 				$tmpUserPerm		= ($isAnybody == 0) ? 5 : 1;
! 				$dbLink->cleanResults();
! 			} // end of true new room
! 
! 			// The user will be moderator for this room -> update tables (note
! 			// that older moderators becomes 'simple users' for the target room)
! 			if ($tmpUserPerm == 5)
! 			{
! 				$dbLink->query("DELETE FROM " . C_RIGHT_TBL . " WHERE room = '$slashedTargetRoomName'");
! 				$dbLink->query("INSERT INTO " . C_RIGHT_TBL . " (username, room, right_level) VALUES ('$slashedNick', '$slashedTargetRoomName', 5)");
! 			} // end of updating the right level table
! 
! 			return $tmpUserPerm;
! 		} // end of 3.2
! 	} // end of 'other cases'
  } // end of the 'pmcRightLevel()' function
  	

Index: login.lib.js
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/login.lib.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** login.lib.js	2001/04/19 21:05:04	1.3
--- login.lib.js	2001/06/10 14:57:48	1.4
***************
*** 30,38 ****
  {
  	// The replace function (js1.2) isn't supported -> no js tests are done
! 	if (typeof(document.forms['loginForm'].elements['authUsername'].value.replace) == 'undefined')
  		return true;
  
! 	var nickField	= document.forms['loginForm'].elements['authUsername'];
! 	var pswdField	= document.forms['loginForm'].elements['authPassword'];
  	var	re			= /\\|,| /;
  
--- 30,38 ----
  {
  	// The replace function (js1.2) isn't supported -> no js tests are done
! 	if (typeof(document.forms['loginForm'].elements['pmcAuthUsername'].value.replace) == 'undefined')
  		return true;
  
! 	var nickField	= document.forms['loginForm'].elements['pmcAuthUsername'];
! 	var pswdField	= document.forms['loginForm'].elements['pmcAuthPassword'];
  	var	re			= /\\|,| /;
  

Index: login.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/login.lib.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** login.lib.php3	2001/06/01 20:44:40	1.9
--- login.lib.php3	2001/06/10 14:57:48	1.10
***************
*** 44,74 ****
   * defined inside the 'chat/lib/common.lib.php3' library
   */
  $doNotLogin = false;
! if ((!empty($authUsername)) && (!empty($authPassword)))
  {
! 	if (!empty($authUsername))
! 		$authUsername			= pmcHandleMagicQuotes($authUsername, '1', '', 'del');
! 	if (!empty($authPassword))
! 		$authPassword			= pmcHandleMagicQuotes($authPassword, '1', '', 'del');
  
  	// Ensures the password is a correct one
  	$dbLoginLink = new pmcDB;
! 	$dbLoginLink->query("SELECT password, perms FROM " . C_REG_TBL . " WHERE username = '" . pmcSlashSingleQuotes($authUsername) . "' LIMIT 1");
! 	if (list($storedPassword, $perms) = $dbLoginLink->nextRecord())
  	{
  		$storedPassword	= pmcHandleMagicQuotes($storedPassword, '', '1', 'del');
  		// Validates the password submitted (compare also its md5 hash for
  		// compatibility with old releases)
! 		if ($storedPassword == $authPassword || $storedPassword == md5($authPassword))
  		{
! 			// Ensure the one who lauches the admin.php3 script is the admin 
! 			if (isset($mustBeAdmin) && $perms != 'admin')
  			{
! 				$error = L_ERR_USR_11;
  			}
! 			else
  			{
! 				$dbSessionVars['authUsername']	= $authUsername;
! 				$dbSessionVars['authPassword']	= $authPassword;
  				dbSessionSave();
  				$doNotLogin = true;
--- 44,91 ----
   * defined inside the 'chat/lib/common.lib.php3' library
   */
+ $error		= '';
  $doNotLogin = false;
! if ((!empty($pmcAuthUsername)) && (!empty($pmcAuthPassword)))
  {
! 	if (!empty($pmcAuthUsername))
! 	{
! 		$pmcAuthUsername		= pmcHandleMagicQuotes($pmcAuthUsername, '1', '', 'del');
! 		$slashedAuthUsername	= pmcSlashSingleQuotes($pmcAuthUsername);
! 	}
! 	if (!empty($pmcAuthPassword))
! 	{
! 		$pmcAuthPassword		= pmcHandleMagicQuotes($pmcAuthPassword, '1', '', 'del');
! 	}
  
  	// Ensures the password is a correct one
  	$dbLoginLink = new pmcDB;
! 	$dbLoginLink->query("SELECT password FROM " . C_REG_TBL . " WHERE username = '$slashedAuthUsername' LIMIT 1");
! 	if (list($storedPassword) = $dbLoginLink->nextRecord())
  	{
  		$storedPassword	= pmcHandleMagicQuotes($storedPassword, '', '1', 'del');
  		// Validates the password submitted (compare also its md5 hash for
  		// compatibility with old releases)
! 		if ($storedPassword == $pmcAuthPassword || $storedPassword == md5($pmcAuthPassword))
  		{
! 			// Ensure either:
! 			// - the one who lauches the admin.php3 script is the admin
! 			// - the one who wants to delete his/her profile is not the admin
! 			if (isset($mustBeAdmin) || isset($mustNotBeAdmin))
  			{
! 				$dbLoginLink->query("SELECT right_level FROM " . C_RIGHT_TBL . " WHERE username = '$slashedAuthUsername' LIMIT 1");
! 				list($perms) = $dbLoginLink->nextRecord();
! 				if (empty($perms))
! 				{
! 					$perms = 0;
! 				}
! 				if (isset($mustBeAdmin) && $perms != 10)
! 				{
! 					$error = L_ERR_USR_11;
! 				}
  			}
! 			if (empty($error))
  			{
! 				$dbSessionVars['authUsername']	= $pmcAuthUsername;
! 				$dbSessionVars['authPassword']	= $pmcAuthPassword;
  				dbSessionSave();
  				$doNotLogin = true;
***************
*** 108,118 ****
  
  	// Initialise the username field
! 	if (!isset($authUsername) && dbSessionIsRegistered('nick'))
  	{
! 		$authUsername = $dbSessionVars['nick'];
  	}
  
  	// If username exist, put focus to the password field else to the username
! 	$focus = (!empty($authUsername)) ? 'authPassword' : 'authUsername';
  
  	$cssUrl = pmcUrlForStyleSheet('style', L_CHARSET, (defined('L_FONT_NAME')) ? L_FONT_NAME : '', L_FONT_SIZE);
--- 125,135 ----
  
  	// Initialise the username field
! 	if (!isset($pmcAuthUsername) && dbSessionIsRegistered('nick'))
  	{
! 		$pmcAuthUsername = $dbSessionVars['nick'];
  	}
  
  	// If username exist, put focus to the password field else to the username
! 	$focus = (!empty($pmcAuthUsername)) ? 'pmcAuthPassword' : 'pmcAuthUsername';
  
  	$cssUrl = pmcUrlForStyleSheet('style', L_CHARSET, (defined('L_FONT_NAME')) ? L_FONT_NAME : '', L_FONT_SIZE);
***************
*** 154,158 ****
  			<td align="right" valign="top" nowrap="nowrap"><?php echo(L_SET_2); ?> :</td>
  			<td valign="top">
! 				<input type="text" name="authUsername" size="11" maxlength="10" value="<?php if (isset($authUsername)) echo(htmlspecialchars($authUsername)); ?>" />
  			</td>
  		</tr>
--- 171,175 ----
  			<td align="right" valign="top" nowrap="nowrap"><?php echo(L_SET_2); ?> :</td>
  			<td valign="top">
! 				<input type="text" name="pmcAuthUsername" size="11" maxlength="10" value="<?php if (isset($pmcAuthUsername)) echo(htmlspecialchars($pmcAuthUsername)); ?>" />
  			</td>
  		</tr>
***************
*** 160,164 ****
  			<td align="right" valign="top" nowrap="nowrap"><?php echo(L_REG_7); ?> :</td>
  			<td valign="top">
! 				<input type="password" name="authPassword" size="11" maxlength="16" value="<?php if (isset($authPassword)) echo(htmlspecialchars($authPassword)); ?>" />
  			</td>
  		</tr>
--- 177,181 ----
  			<td align="right" valign="top" nowrap="nowrap"><?php echo(L_REG_7); ?> :</td>
  			<td valign="top">
! 				<input type="password" name="pmcAuthPassword" size="11" maxlength="16" value="<?php if (isset($pmcAuthPassword)) echo(htmlspecialchars($pmcAuthPassword)); ?>" />
  			</td>
  		</tr>

Index: profile_work.lib.js
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/profile_work.lib.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** profile_work.lib.js	2001/05/16 20:54:32	1.4
--- profile_work.lib.js	2001/06/10 14:57:48	1.5
***************
*** 32,36 ****
  {
  	window.focus();
! 	document.forms[formName].elements['nick'].focus();
  } // end of the function 'pmcGetFocus()'
  
--- 32,36 ----
  {
  	window.focus();
! 	document.forms[formName].elements['pmcProfNick'].focus();
  } // end of the function 'pmcGetFocus()'
  
***************
*** 42,54 ****
  {
  	// The replace function (js1.2) isn't supported -> no js tests are done
! 	if (typeof(document.forms[formName].elements['nick'].value.replace) == 'undefined')
  		return true;
  
! 	var nickField		= document.forms[formName].elements['nick'];
  	if (!jsIsMailValid)
! 		var pswdField	= document.forms[formName].elements['password'];
! 	var fNameField		= document.forms[formName].elements['firstName'];
! 	var lNameField		= document.forms[formName].elements['lastName'];
! 	var emailField		= document.forms[formName].elements['email'];
  
  	var reNick			= /\\|,| /;
--- 42,54 ----
  {
  	// The replace function (js1.2) isn't supported -> no js tests are done
! 	if (typeof(document.forms[formName].elements['pmcProfNick'].value.replace) == 'undefined')
  		return true;
  
! 	var nickField		= document.forms[formName].elements['pmcProfNick'];
  	if (!jsIsMailValid)
! 		var pswdField	= document.forms[formName].elements['pmcProfPassword'];
! 	var fNameField		= document.forms[formName].elements['pmcProfFirstName'];
! 	var lNameField		= document.forms[formName].elements['pmcProfLastName'];
! 	var emailField		= document.forms[formName].elements['pmcProfEmail'];
  
  	var reNick			= /\\|,| /;
***************
*** 123,130 ****
  {
  	// The replace function (js1.2) isn't supported -> no js tests are done
! 	if (typeof(document.forms[formName].elements['nick'].value.replace) == 'undefined')
  		return true;
  
! 	var nickField		= document.forms[formName].elements['nick'];
  	var reNick			= /\\|,| /;
  
--- 123,130 ----
  {
  	// The replace function (js1.2) isn't supported -> no js tests are done
! 	if (typeof(document.forms[formName].elements['pmcProfNick'].value.replace) == 'undefined')
  		return true;
  
! 	var nickField		= document.forms[formName].elements['pmcProfNick'];
  	var reNick			= /\\|,| /;
  
***************
*** 160,166 ****
  	var regForm		= document.forms[formName];
  
! 	indexForm.elements['nick'].value			= regForm.elements['nick'].value;
  	if (!jsIsMailValid)
! 		indexForm.elements['password'].value	= regForm.elements['password'].value;
  } // end of the function 'pmcLoginToIndex()'
  
--- 160,166 ----
  	var regForm		= document.forms[formName];
  
! 	indexForm.elements['pmcNick'].value			= regForm.elements['pmcProfNick'].value;
  	if (!jsIsMailValid)
! 		indexForm.elements['pmcPassword'].value	= regForm.elements['pmcProfPassword'].value;
  } // end of the function 'pmcLoginToIndex()'
  

Index: upgrades.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/upgrades.lib.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** upgrades.lib.php3	2001/05/30 08:07:12	1.5
--- upgrades.lib.php3	2001/06/10 14:57:48	1.6
***************
*** 62,66 ****
  	while (list($oldName, $value) = each($oldCookies))
  	{
! 		$newName = str_replace('Cookie', 'cookie', $oldName);
  		setcookie($newName, $value, $newExpireTime);
  		setcookie($oldName, '',  $delExpireTime);
--- 62,73 ----
  	while (list($oldName, $value) = each($oldCookies))
  	{
! 		if ($oldName == 'CookieUsername')
! 		{
! 			$newName	= 'cookiePmcUsername';
! 		}
! 		else
! 		{
! 			$newName	= str_replace('Cookie', 'cookie', $oldName);
! 		}
  		setcookie($newName, $value, $newExpireTime);
  		setcookie($oldName, '',  $delExpireTime);
***************
*** 108,117 ****
  	if (isset($U))
  	{
! 		$nick = $U;
  		unset($U);
  	}
  	if (isset($PASSWORD))
  	{
! 		$password = $PASSWORD;
  		unset($PASSWORD);
  	}
--- 115,124 ----
  	if (isset($U))
  	{
! 		$pmcNick = $U;
  		unset($U);
  	}
  	if (isset($PASSWORD))
  	{
! 		$pmcPassword = $PASSWORD;
  		unset($PASSWORD);
  	}

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/install/database mysql.sql,1.7,1.8

From: Lo?c C. <lo...@us...> - 2001-06-10 14:58:20

Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/install/database
In directory usw-pr-cvs1:/tmp/cvs-serv17318/chat/install/database

Modified Files:
	mysql.sql 
Log Message:
Too many changes to detail.

Index: mysql.sql
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/install/database/mysql.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** mysql.sql	2001/05/27 15:21:32	1.7
--- mysql.sql	2001/06/10 14:57:47	1.8
***************
*** 1,7 ****
  #
  # Table structure for table 'pmc_ban_users'
  #
  
! DROP TABLE /*!32312 IF EXISTS*/ pmc_ban_users;
  CREATE TABLE pmc_ban_users (
    username varchar(30) NOT NULL DEFAULT '' ,
--- 1,12 ----
+ # -----------------------------------------
+ # Tables structure for phpMyChat 0.15.0-dev
+ # -----------------------------------------
+ 
+ 
  #
  # Table structure for table 'pmc_ban_users'
  #
  
! DROP TABLE /*!32200 IF EXISTS*/ pmc_ban_users;
  CREATE TABLE pmc_ban_users (
    username varchar(30) NOT NULL DEFAULT '' ,
***************
*** 10,16 ****
    rooms varchar(100) NOT NULL DEFAULT '' ,
    ban_until int(11) unsigned NOT NULL DEFAULT '0' ,
!   PRIMARY KEY (username),
!   KEY ip (ip),
!   KEY ban_until (ban_until)
  );
  
--- 15,20 ----
    rooms varchar(100) NOT NULL DEFAULT '' ,
    ban_until int(11) unsigned NOT NULL DEFAULT '0' ,
!   PRIMARY KEY (username, ip),
!   INDEX idx1 (ban_until)
  );
  
***************
*** 20,36 ****
  #
  
! DROP TABLE /*!32312 IF EXISTS*/ pmc_messages;
  CREATE TABLE pmc_messages (
-   type tinyint(1) unsigned NOT NULL DEFAULT '0' ,
    room varchar(30) NOT NULL DEFAULT '' ,
    username varchar(30) NOT NULL DEFAULT '' ,
    latin1 tinyint(1) unsigned NOT NULL DEFAULT '0' ,
    m_time int(11) unsigned NOT NULL DEFAULT '0' ,
!   address varchar(30) ,
    color varchar(7) NOT NULL DEFAULT '#000000' ,
    msg_original text NOT NULL DEFAULT '' ,
    msg_enhanced text NOT NULL DEFAULT '' ,
!   KEY type (type),
!   KEY m_time (m_time)
  );
  
--- 24,40 ----
  #
  
! DROP TABLE /*!32200 IF EXISTS*/ pmc_messages;
  CREATE TABLE pmc_messages (
    room varchar(30) NOT NULL DEFAULT '' ,
    username varchar(30) NOT NULL DEFAULT '' ,
    latin1 tinyint(1) unsigned NOT NULL DEFAULT '0' ,
    m_time int(11) unsigned NOT NULL DEFAULT '0' ,
!   address varchar(30) NOT NULL DEFAULT '' ,
    color varchar(7) NOT NULL DEFAULT '#000000' ,
    msg_original text NOT NULL DEFAULT '' ,
    msg_enhanced text NOT NULL DEFAULT '' ,
!   PRIMARY KEY (username, room, m_time),
!   INDEX idx1 (m_time, room, address, username),
!   INDEX idx2 (m_time, username)
  );
  
***************
*** 40,70 ****
  #
  
! CREATE TABLE /*!32312 IF NOT EXISTS*/ pmc_reg_users (
    username varchar(30) NOT NULL DEFAULT '' ,
!   latin1 tinyint(1) unsigned NOT NULL DEFAULT '0' ,
    password varchar(32) NOT NULL DEFAULT '' ,
    firstname varchar(64) NOT NULL DEFAULT '' ,
    lastname varchar(64) NOT NULL DEFAULT '' ,
!   country varchar(64) ,
!   website varchar(64) ,
    email varchar(64) NOT NULL DEFAULT '' ,
    showemail tinyint(1) unsigned NOT NULL DEFAULT '0' ,
-   perms varchar(9) NOT NULL DEFAULT 'user' ,
-   rooms varchar(128) NOT NULL DEFAULT '' ,
    reg_time int(11) unsigned NOT NULL DEFAULT '0' ,
    ip varchar(16) NOT NULL DEFAULT '' ,
    gender tinyint(1) unsigned NOT NULL DEFAULT '0' ,
    PRIMARY KEY (username),
!   KEY reg_time (reg_time),
!   KEY perms (perms)
  );
! INSERT INTO pmc_reg_users VALUES('admin', '', 'admin', '', '', '', '', '', 0, 'admin', '', '', '', '');
  
  
  #
  # Table structure for table 'pmc_sessions'
  #
  
! DROP TABLE /*!32312 IF EXISTS*/ pmc_sessions;
  CREATE TABLE pmc_sessions (
    session_id varchar(32) NOT NULL DEFAULT '' ,
--- 44,102 ----
  #
  
! DROP TABLE /*!32200 IF EXISTS*/ pmc_reg_users;
! CREATE TABLE pmc_reg_users (
    username varchar(30) NOT NULL DEFAULT '' ,
!   charset varchar(20) NOT NULL DEFAULT 'x-user-defined' ,
    password varchar(32) NOT NULL DEFAULT '' ,
    firstname varchar(64) NOT NULL DEFAULT '' ,
    lastname varchar(64) NOT NULL DEFAULT '' ,
!   country varchar(64) NOT NULL DEFAULT '' ,
!   website varchar(64) NOT NULL DEFAULT '' ,
    email varchar(64) NOT NULL DEFAULT '' ,
    showemail tinyint(1) unsigned NOT NULL DEFAULT '0' ,
    reg_time int(11) unsigned NOT NULL DEFAULT '0' ,
    ip varchar(16) NOT NULL DEFAULT '' ,
    gender tinyint(1) unsigned NOT NULL DEFAULT '0' ,
    PRIMARY KEY (username),
!   INDEX idx1 (reg_time)
  );
! INSERT INTO pmc_reg_users VALUES('admin', '', 'admin', '', '', '', '', '', 0, '', '', '');
  
  
  #
+ # Table structure for table 'pmc_rights'
+ # right_level is : 10 for the administrator,
+ #                   5 for a moderator 
+ #
+ 
+ DROP TABLE /*!32200 IF EXISTS*/ pmc_rights;
+ CREATE TABLE pmc_rights (
+   username varchar(30) NOT NULL DEFAULT '' ,
+   room varchar(30) NOT NULL DEFAULT '' ,
+   right_level tinyint(2) unsigned NOT NULL DEFAULT '5' ,
+   PRIMARY KEY (username, room),
+   INDEX idx1 (room)
+ );
+ INSERT INTO pmc_rights VALUES('admin', '', 10);
+ 
+ 
+ #
+ # Table structure for table 'pmc_rooms'
+ #
+ 
+ DROP TABLE /*!32200 IF EXISTS*/ pmc_rooms;
+ CREATE TABLE pmc_rooms (
+   room_type tinyint(1) unsigned NOT NULL DEFAULT '1' ,
+   room_name varchar(30) NOT NULL DEFAULT '' ,
+   last_user_modif int(11) unsigned NOT NULL DEFAULT '0' ,
+   PRIMARY KEY (room_name)
+ );
+ 
+ 
+ #
  # Table structure for table 'pmc_sessions'
  #
  
! DROP TABLE /*!32200 IF EXISTS*/ pmc_sessions;
  CREATE TABLE pmc_sessions (
    session_id varchar(32) NOT NULL DEFAULT '' ,
***************
*** 72,77 ****
    last int(11) unsigned NOT NULL DEFAULT '0' ,
    data text ,
!   PRIMARY KEY (session_id),
!   KEY last (last)
  );
  
--- 104,109 ----
    last int(11) unsigned NOT NULL DEFAULT '0' ,
    data text ,
!   PRIMARY KEY (session_id, ip),
!   INDEX idx1 (last)
  );
  
***************
*** 81,85 ****
  #
  
! DROP TABLE /*!32312 IF EXISTS*/ pmc_users;
  CREATE TABLE pmc_users (
    session_id varchar(32) NOT NULL DEFAULT '' ,
--- 113,117 ----
  #
  
! DROP TABLE /*!32200 IF EXISTS*/ pmc_users;
  CREATE TABLE pmc_users (
    session_id varchar(32) NOT NULL DEFAULT '' ,
***************
*** 88,97 ****
    username varchar(30) NOT NULL DEFAULT '' ,
    latin1 tinyint(1) unsigned NOT NULL DEFAULT '0' ,
!   status char(1) NOT NULL DEFAULT 'u' ,
    ip varchar(16) NOT NULL DEFAULT '' ,
!   PRIMARY KEY (session_id),
!   PRIMARY KEY (username),
!   KEY room (room),
!   KEY status (status),
!   KEY u_time (u_time)
  );
--- 120,128 ----
    username varchar(30) NOT NULL DEFAULT '' ,
    latin1 tinyint(1) unsigned NOT NULL DEFAULT '0' ,
!   status char(2) NOT NULL DEFAULT '0' ,
    ip varchar(16) NOT NULL DEFAULT '' ,
!   away tinyint(1) unsigned NOT NULL DEFAULT '0' ,
!   PRIMARY KEY (username, room),
!   INDEX idx1 (u_time, status),
!   INDEX idx2 (session_id)
  );

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/config config.lib.php3,1.8,1.9

From: Lo?c C. <lo...@us...> - 2001-06-10 14:58:20

Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/config
In directory usw-pr-cvs1:/tmp/cvs-serv17318/chat/config

Modified Files:
	config.lib.php3 
Log Message:
Too many changes to detail.

Index: config.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/config/config.lib.php3,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** config.lib.php3	2001/05/17 19:28:52	1.8
--- config.lib.php3	2001/06/10 14:57:47	1.9
***************
*** 37,41 ****
--- 37,43 ----
  define('C_DB_PASS', 'password');			// Database user's password
  define('C_SESS_TBL', 'pmc_sessions'); 		// Name of the table where session data are stored
+ define('C_ROOM_TBL', 'pmc_rooms');			// Name of the table where rooms properties are stored
  define('C_MSG_TBL', 'pmc_messages');		// Name of the table where messages are stored
+ define('C_RIGHT_TBL', 'pmc_rights'); 		// Name of the table where users' rights are stored
  define('C_USR_TBL', 'pmc_users');			// Name of the table where user names are stored
  define('C_REG_TBL', 'pmc_reg_users'); 		// Name of the table where registered users are stored
***************
*** 43,52 ****
  
  // Cleaning settings for messages and usernames
  define('C_MSG_DEL', 96);					// Messages are deleted when there are 'xx' hours old
! define('C_USR_DEL', 4);						// Usernames are deleted when its last use is 'xx' minutes old
  											//	This setting must be greater than the maximum time
  											//	authorized between messages list refresh
! define('C_SESS_DEL', 8);					// Sessions are deleted when its last use is 'xx' minutes old
! 											//	This setting must be greater than the 'C_USR_DEL' one
  define('C_REG_DEL', 0);						// Registered profiles are deleted when its last use is 'xx' days old
  											//	'xx' should be 0 for never 
--- 45,59 ----
  
  // Cleaning settings for messages and usernames
+ define('C_SESS_DEL', 8);					// Sessions are deleted when its last use is 'xx' minutes old
+ 											//	This setting must be greater than the 'C_USR_DEL' one
  define('C_MSG_DEL', 96);					// Messages are deleted when there are 'xx' hours old
! define('C_USR_AWAY', 4);					// Users are considered as "away from their keyboard" when
! 											// the last message they sent is 'xx' minutes old
  											//	This setting must be greater than the maximum time
  											//	authorized between messages list refresh
! define('C_USR_DEL', 2);						// Usernames are deleted when they are "away from their
! 											// keyboard" since more than 'xx' minutes
! 											//	This setting must be greater than the maximum time
! 											//	authorized between messages list refresh
  define('C_REG_DEL', 0);						// Registered profiles are deleted when its last use is 'xx' days old
  											//	'xx' should be 0 for never 
***************
*** 71,74 ****
--- 78,82 ----
  
  // Security and restrictions
+ define('C_MAX_USERS', 0);					// Maximum number of connected users? (0 for no limit)
  define('C_SHOW_ADMIN', 0);					// Show link for admin resources at startup screen ? 0 = no, 1 = yes
  define('C_SHOW_DEL_PROF', 1);				// Show link that allows users to delete their own profile ? 0 = no, 1 = yes

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/images/tutorials_imgs users_list.gif,1.2,1.3

From: Lo?c C. <lo...@us...> - 2001-06-10 14:58:20

Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/images/tutorials_imgs
In directory usw-pr-cvs1:/tmp/cvs-serv17318/chat/images/tutorials_imgs

Modified Files:
	users_list.gif 
Log Message:
Too many changes to detail.

Index: users_list.gif
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/images/tutorials_imgs/users_list.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
Binary files /tmp/cvsj3N3yf and /tmp/cvsW9yp6k differ

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/localization/thai chat.loc,1.9,1.10

From: Lo?c C. <lo...@us...> - 2001-06-10 14:57:55

Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/thai
In directory usw-pr-cvs1:/tmp/cvs-serv17318/chat/localization/thai

Modified Files:
	chat.loc 
Log Message:
Too many changes to detail.

Index: chat.loc
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/thai/chat.loc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** chat.loc	2001/05/16 20:52:57	1.9
--- chat.loc	2001/06/10 14:57:50	1.10
***************
*** 130,137 ****
--- 130,139 ----
  define('L_ERR_USR_19', 'You cannot be in more than one room at the same time.');
  define('L_ERR_USR_20', 'You have been banished from this room or from the chat.');
+ define('L_ERR_USR_21', 'The maximum inactivity delay has been reached.');
  define('L_ERR_ROM_1', 'Room\'s name cannot contain comma or backslash (\\).');
  define('L_ERR_ROM_2', 'Banned word found in the room\'s name you want to create.');
  define('L_ERR_ROM_3', 'ËéÍ§¤ØÂ¹Õéà»ç¹ËéÍ§¤ØÂÃÇÁ');
  define('L_ERR_ROM_4', 'ªÕèÍËéÍ§äÁè¶Ù¡µéÍ§');
+ define('L_ERR_ROM_5', 'The maximum number of connected users is reached.');
  
  // users frame or popup
***************
*** 207,210 ****
--- 209,213 ----
  define('L_HELP_CMD_20', 'Describe what you\'re doing without refer yourself.');
  define('L_HELP_CMD_21', 'Enable/disable graphical smilies mode.');
+ define('L_HELP_CMD_22', 'Tell the other users you\'re not paying attention to the chat ou set you being back. You can also send a message with this command.');
  
  // smilies popup

[phpMyChat CVS] CVS: phpMyChat-0.15/docs bug_report.txt,1.1,1.2 changes.txt,1.6,1.7 credits.txt,1.7,1.8 todo.txt,1.1,1.2

From: Lo?c C. <lo...@us...> - 2001-06-10 14:57:55

Update of /cvsroot/phpmychat/phpMyChat-0.15/docs
In directory usw-pr-cvs1:/tmp/cvs-serv17318/docs

Modified Files:
	bug_report.txt changes.txt credits.txt todo.txt 
Log Message:
Too many changes to detail.

Index: bug_report.txt
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/docs/bug_report.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bug_report.txt	2001/04/26 20:11:41	1.1
--- bug_report.txt	2001/06/10 14:57:50	1.2
***************
*** 1,46 ****
! To report bugs, either do it at the 'Bug Tracking System' from our
! SourceForge account (http://phpmychat.sorceforge.net/) either fill the form
! below and send it to the php...@ya... e-mail address.
  
  Please be as descriptive as possible. You may think it's something that
! affects everyone, but a many times it's specific to a browser or
  operating system. So please be thorough. In the case of Bug Tracking,
  there is *never* too much information or documentation or description.
  
  Thanks for your help,
  the phpHeaven-team
  
  
! +--------------------------------------------------------------------------+
! | phpMyChat version 0.15.0 - dev                                           |
! +--------------------------------------------------------------------------+
! | The server side:                                                         |
! | - Operating system and release number:                                   |
! | - the server name and release number:                                    |
! | - the php version that is running:                                       |
! | - the database management system name and release number that is         |
! |   running:                                                               |
! |                                                                          |
! | The client side:                                                         |
! | - Operating system and release number:                                   |
! | - the browser name and release number:                                   |
! +--------------------------------------------------------------------------+
! | A brief description of the bug you faced:                                |
! |                                                                          |
! |                                                                          |
! |                                                                          |
! +--------------------------------------------------------------------------+
! | Details:                                                                 |
! |                                                                          |
! |                                                                          |
! |                                                                          |
! |                                                                          |
! |                                                                          |
! |                                                                          |
! |                                                                          |
! |                                                                          |
! |                                                                          |
! |                                                                          |
! |                                                                          |
! |                                                                          |
! +--------------------------------------------------------------------------+
\ No newline at end of file
--- 1,81 ----
! ----------------
!  Reporting Bugs
! ----------------
  
+ To report bugs, either do it in the 'Bug Tracking System' of our
+ SourceForge account (http://phpmychat.sorceforge.net/), either fill the
+ form below and send it to our team address : te...@ph...
+ 
  Please be as descriptive as possible. You may think it's something that
! affects everyone, but many times it's specific to a browser or
  operating system. So please be thorough. In the case of Bug Tracking,
  there is *never* too much information or documentation or description.
  
  Thanks for your help,
+ 
  the phpHeaven-team
  
+ 
+ ---8<-------------------------------------------------------------------
+ 
+ #
+ # BUG TRACKING for phpMyChat
+ #
+ 
+ How to contact you:
+ """""""""""""""""""
+ 
+ Your name                           :
+ 
+ Your e-mail address                 :
+ 
+ Your web site                       :
+ 
+ 
+ 
+ Server side:
+ """"""""""""
+ 
+ Operating System (name and release) :
+ 
+ HTTP Server (name and release)      :
+ 
+ PHP version and configuration       :
+ 
+      You can join your 'php.ini' file
+      or the result of the 'phpinfo' function
+ 
+ Database software and release       :
+ 
+ phpMyChat version and configuration :
+ 
+      You can join your 'config.lib.php' file
+      (without the password you use)
+ 
+ URL where the bug can be seen       : http://
+ 
+ 
+ 
+ Client side:
+ """"""""""""
+ 
+ Operating system (name and release) :
+ 
+ Browser (name and release)          :
+ 
+ 
+ 
+ Brief description of the bug/problem:
+ """""""""""""""""""""""""""""""""""""
+ 
+ 
+ 
+ Details:
+ """"""""
+ 
+ 
+ 
+ 
+ 
  
! ---8<-------------------------------------------------------------------

Index: changes.txt
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/docs/changes.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** changes.txt	2001/05/31 19:57:42	1.6
--- changes.txt	2001/06/10 14:57:50	1.7
***************
*** 8,12 ****
  
  
! v 0.15.0 - 31/05/2001
  """""""""""""""""""""
  
--- 8,12 ----
  
  
! v 0.15.0 - 10/06/2001
  """""""""""""""""""""
  
***************
*** 20,23 ****
--- 20,27 ----
  		As a result, phpMyChat works far better with Mozilla M18 (and the should
  		also with Netscape 6).
+   ENHANCEMENT : the '/away' command has been added. Moreover the way incative users are
+ 		handled have changed: in a first time they are automatically defined as
+ 		'away from their keybord' users then they are removed from the users
+ 		table.
    ENHANCEMENT : with the new command '/img' the user can choose to display graphical
  		smilies or text codes thanks to an original piece of code from
***************
*** 30,33 ****
--- 34,49 ----
  		thanks to a piece of code from Tomas Haluza <th...@ki...>.
    BUG FIXED   : many JavaScript bugs have been fixed in this release.
+ 
+ 
+ v 0.14.5-RC1 - 08/06/2001
+ """""""""""""""""""""""""
+ 
+   BUG FIXED   : two security issues has been fixed thanks to
+ 		Alexei Shalin <hap...@to...>.
+   BUG FIXED   : when registered users used the '/join' command or on the link in an
+ 		invitation messages they may loose their rights or be kicked off
+ 		because of a wrong password encoding.
+ 		Bug fixed thanks to Tinou <ti...@ti...>.
+   ENHANCEMENT : some translations have been completed.
  
  

Index: credits.txt
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/docs/credits.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** credits.txt	2001/06/08 07:07:20	1.7
--- credits.txt	2001/06/10 14:57:50	1.8
***************
*** 21,24 ****
--- 21,25 ----
  Matthieu Belge <mb...@fr...>
    Great Perl-like regular expressions
+   Benchmarks
  
  Martin Dvorak <je...@pe...>
***************
*** 31,34 ****
--- 32,41 ----
  Christian Hacker <c.h...@dr...>
    Mail feature for the administrator
+ 
+ Etienne Gagnon <ti...@ti...>
+   Database design and optimization
+ 
+ Sergey I. Golod <ro...@to...>
+   Security analysis
  
  

Index: todo.txt
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/docs/todo.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** todo.txt	2001/05/30 19:19:18	1.1
--- todo.txt	2001/06/10 14:57:50	1.2
***************
*** 7,13 ****
  """"""""""""""""""""
  
! - Better system to display DB error messages
! - Better design configuration
! - Allow to limit the number of smilies in each message
! - Command for administrator to unpromote
  - Dynamic integration of smilies, like for languages
--- 7,25 ----
  """"""""""""""""""""
  
! - Rebuild the whole administration script and add a search feature
! - Allow to ban by IP + network mask from the admin script
! - Better design configuration (templates ?)
  - Dynamic integration of smilies, like for languages
+ - Improve caching system
+ - Command for administrator to unpromote
+ - Allow to send private messages accross rooms
+ - opCall command
+ - Find a way to retain session data defined before going to the chat
+ - Add topic for room (use the same system than the one used for the
+   administration of the phpHeaven site?)
+ - Send logs and stats of the day to the administrator?
+ - For a private room, do not allow to browse among messages sent
+   before the user logs in?
+ - Allow to use one css per room?
+ 
+

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/localization/turkish chat.loc,1.8,1.9 tutorial.loc,1.8,1.9

From: Lo?c C. <lo...@us...> - 2001-06-10 14:57:55

Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/turkish
In directory usw-pr-cvs1:/tmp/cvs-serv17318/chat/localization/turkish

Modified Files:
	chat.loc tutorial.loc 
Log Message:
Too many changes to detail.

Index: chat.loc
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/turkish/chat.loc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** chat.loc	2001/05/16 20:52:57	1.8
--- chat.loc	2001/06/10 14:57:50	1.9
***************
*** 131,138 ****
--- 131,140 ----
  define('L_ERR_USR_19', 'Ayni anda birden fazla odada olamazsiniz.');
  define('L_ERR_USR_20', 'Bu odadan veya chatten ihraç edildiniz.');
+ define('L_ERR_USR_21', 'The maximum inactivity delay has been reached.');
  define('L_ERR_ROM_1', 'Oda isminde virgül ve Backslash (\\) yasaktir.');
  define('L_ERR_ROM_2', 'Oda isminde yasaklanmis kelime var!');
  define('L_ERR_ROM_3', 'Bu isimde umumi oda var.');
  define('L_ERR_ROM_4', 'Geçersiz oda ismi.');
+ define('L_ERR_ROM_5', 'The maximum number of connected users is reached.');
  
  // users frame or popup
***************
*** 207,210 ****
--- 209,213 ----
  define('L_HELP_CMD_20', 'Describe what you\'re doing without refer yourself.');
  define('L_HELP_CMD_21', 'Enable/disable graphical smilies mode.');
+ define('L_HELP_CMD_22', 'Tell the other users you\'re not paying attention to the chat ou set you being back. You can also send a message with this command.');
  
  // smilies popup

Index: tutorial.loc
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/turkish/tutorial.loc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** tutorial.loc	2001/05/07 21:09:52	1.8
--- tutorial.loc	2001/06/10 14:57:50	1.9
***************
*** 158,161 ****
--- 158,162 ----
  &nbsp;&nbsp;&nbsp;&nbsp;<a href="#actions" class="topLink">Actions</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;<a href="#ignore" class="topLink">Diger kullanicilari ignore et</a><br />
+ &nbsp;&nbsp;&nbsp;&nbsp;<a href="#away" class="topLink">Doing a pause</a><br />
  &nbsp;&nbsp;&nbsp;&nbsp;<a href="#whois" class="topLink">Diger Kullanicilar hakkinda bilgiler</a><br />
  <?php
***************
*** 316,320 ****
--- 317,324 ----
  </p>
  <p>
+ <!-- To update
  Kullanici listesi icin iki kural var:
+ -->
+ Three basic rules have been defined for the users list:
  </p>
  <ol>
***************
*** 323,327 ****
  	-->
  	<li>a little icon that shows gender is displayed before the nick of a registered user (clicking on it will launch the <a href="#whois">whois popup</a> for this user), while unregistered users have nothing but blank spaces displayed before their nick;</li>
! 	<li>Yönetici ve Administratörlerin isimleri egri yazilir.</li>
  </ol>
  <p>
--- 327,332 ----
  	-->
  	<li>a little icon that shows gender is displayed before the nick of a registered user (clicking on it will launch the <a href="#whois">whois popup</a> for this user), while unregistered users have nothing but blank spaces displayed before their nick;</li>
! 	<li>Yönetici ve Administratörlerin isimleri egri yazilir;</li>
! 	<li>the nicks of <a href="#away">inactive users</a> have a horizontal line striking through them.</li>
  </ol>
  <p>
***************
*** 340,344 ****
  		<li>Mary nin kayitsiz bir kullanici oldugu belli olur.</li>
  		-->
! 		<li>alien (whose gender is unknown), Jezek2 and Caridad are registered users with no extra "power" for the phpMyChat room;<br /><br /></li>
  		<li>lolo es un simple usuario no registrado.</li>
  	</ul>
--- 345,349 ----
  		<li>Mary nin kayitsiz bir kullanici oldugu belli olur.</li>
  		-->
! 		<li>alien (whose gender is unknown), Jezek2 (who is not paying attention to the chat) and Caridad are registered users with no extra "power" for the phpMyChat room;<br /><br /></li>
  		<li>lolo es un simple usuario no registrado.</li>
  	</ul>
***************
*** 688,691 ****
--- 693,713 ----
  <p>
  Beachte, dass Du mehrere Benutzernamen angeben kannst (z.B. "/ignore Jack,Helen,Alf" oder "/ignore - Jack,Alf"). Diese müssen durch Kommata (,) ohne Abstände getrennt werden.
+ </p>
+ <p align="right"><a href="#top">Basa Dön</a></p>
+ <hr />
+ 
+ <p>
+ <font size="+1"><a name="away"><b>Doing a pause:</b></a></font>
+ </p>
+ <p>
+ To tell the other users you're not paying attention to the chat while being connected, type the <b>command "/away"</b> without quotes.<br />
+ Then your username will be displayed with a horizontal line striking through it in the users' list.
+ </p>
+ <p>
+ To come back to the chat, just send a new message or use again the "/away" command.
+ </p>
+ <p>
+ Note that you may send a message with the away ccommand.<br />
+ <i>For example :</i> /away I'll be back in a few minutes.
  </p>
  <p align="right"><a href="#top">Basa Dön</a></p>

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/localization/swedish chat.loc,1.9,1.10

From: Lo?c C. <lo...@us...> - 2001-06-10 14:57:55

Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/swedish
In directory usw-pr-cvs1:/tmp/cvs-serv17318/chat/localization/swedish

Modified Files:
	chat.loc 
Log Message:
Too many changes to detail.

Index: chat.loc
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/swedish/chat.loc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** chat.loc	2001/05/16 20:52:57	1.9
--- chat.loc	2001/06/10 14:57:50	1.10
***************
*** 131,138 ****
--- 131,140 ----
  define('L_ERR_USR_19', 'You cannot be in more than one room at the same time.');
  define('L_ERR_USR_20', 'You have been banished from this room or from the chat.');
+ define('L_ERR_USR_21', 'The maximum inactivity delay has been reached.');
  define('L_ERR_ROM_1', 'Kanalens namn får inte innehålla komma eller backslash (\\).');
  define('L_ERR_ROM_2', 'Banned word found in the room\'s name you want to create.');
  define('L_ERR_ROM_3', 'Det finns redan en publik kanal med det här namnet.');
  define('L_ERR_ROM_4', 'Ogiltigt kanalnamn.');
+ define('L_ERR_ROM_5', 'The maximum number of connected users is reached.');
  
  // users frame or popup
***************
*** 208,211 ****
--- 210,214 ----
  define('L_HELP_CMD_20', 'Describe what you\'re doing without refer yourself.');
  define('L_HELP_CMD_21', 'Enable/disable graphical smilies mode.');
+ define('L_HELP_CMD_22', 'Tell the other users you\'re not paying attention to the chat ou set you being back. You can also send a message with this command.');
  
  // smilies popup

[phpMyChat CVS] CVS: phpMyChat-0.15/chat/localization/spanish chat.loc,1.9,1.10 tutorial.loc,1.10,1.11