[phpMyChat CVS] CVS: phpMyChat-0.15/chat setup.php3,NONE,1.1 ignore_popup.php3,NONE,1.1 whois_popup.php3,1.5,1.6 profile_reg.php3,1.3,1.4 profile_edit.php3,1.3,1.4 input.php3,1.12,1.13 help_popup.php3,1.3,1.4 handle_input.php3,1.10,1.11

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

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

Modified Files:
	whois_popup.php3 profile_reg.php3 profile_edit.php3 input.php3 
	help_popup.php3 handle_input.php3 
Added Files:
	setup.php3 ignore_popup.php3 
Log Message:
Two many modifications, I can't detail

--- NEW FILE ---
<?php
//
// +------------------------------------------------------------------------+
// | phpMyChat version 0.15.0                                               |
// +------------------------------------------------------------------------+
// | Copyright (c) 2000-2001 The phpHeaven-team                             |
// +------------------------------------------------------------------------+
// | This script displays the easy setup sheets for phpMyChat.              |
// | One function is defined inside:                                        |
// |   - checkRoomsNames() = ensures there is no confusion between default  |
// |                         private and public rooms names                 |
// +------------------------------------------------------------------------+
// | From the phpMyChat project:                                            |
// |    http://www.phpheaven.net/projects/phpMyChat/                        |
// |                                                                        |
// | Authors: the phpHeaven-team <php...@ya...>           |
// +------------------------------------------------------------------------+
//
// $Id: setup.php3,v 1.1 2001/04/11 23:06:12 loic1 Exp $
//
// Easy setup script for phpMyChat.
//



/**
 * Ensures that the same name is not used for default private and public rooms
 *
 * @param	string	list of public rooms names
 * @param	string	list of private rooms names
 *
 * @return	boolean	false if no problem has been detected
 *
 * @access	private
 */
function checkRoomsNames($pubList = '', $privList = '')
{
	$rooms = explode(',', $privList);
	for (reset($rooms); $roomName = current($rooms); next($rooms))
	{
		if (pmcIsInto($roomName, $pubList) >= 0)
			return true;
	}
	return false;
}  // end func checkRoomsNames



/**
 * Gets the extension for the php scripts
 */
if (!isset($PHP_SELF))
	$PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
define('C_EXTENSION', (substr($PHP_SELF, -1) == 3) ? 'php3' : 'php');


/**
 * Includes some libraries
 */
require('./lib/common.lib.' . C_EXTENSION);


/**
 * Gets the names and values for variables sent or posted to this script
 *
 * Uses the 'pmcGrabGlobals()' and 'pmcHandleMagicQuotes()' function defined in
 * the 'chat/lib/common.lib.php3' library
 */
$toGrab = array('%GET', '%POST');
pmcGrabGlobals($toGrab);

// Unslashes values of variables sent to this script
if (!empty($cDbUser))
	$cDbUser		= pmcHandleMagicQuotes($cDbUser, '1', '', 'del');
if (!empty($cDbPass))
	$cDbPass		= pmcHandleMagicQuotes($cDbPass, '1', '', 'del');
if (!empty($cPubChatRooms))
	$cPubChatRooms	= pmcHandleMagicQuotes($cPubChatRooms, '1', '', 'del');
if (!empty($cPrivChatRooms))
	$cPrivChatRooms	= pmcHandleMagicQuotes($cPrivChatRooms, '1', '', 'del');
if (!empty($admLog))
	$admLog			= pmcHandleMagicQuotes($admLog, '1', '', 'del');
if (!empty($admPass))
	$admPass		= pmcHandleMagicQuotes($admPass, '1', '', 'del');
if (!empty($admFname))
	$admFname		= pmcHandleMagicQuotes($admFname, '1', '', 'del');
if (!empty($admLname))
	$admLname		= pmcHandleMagicQuotes($admLname, '1', '', 'del');
if (!empty($admLang))
	$admLang		= pmcHandleMagicQuotes($admLang, '1', '', 'del');

							
/**
 * Selects a translation
 */
require('./install/languages/languages.setup.' . C_EXTENSION);
require('./install/languages/' . $lang . '.setup.loc');


/**
 * Initialize some variables
 */
if (!isset($formSent))
	$formSent = 0;
$from = basename($PHP_SELF);



/**
 * The first of the setup pages have been submitted -> checks for values
 * submitted and do the work
 */
if ($formSent == 1)
{
	// Ensures the required fields have been completed
	$error = (trim($cDbName) == '' || trim($cMsgTbl) == '' || trim($cRegTbl) == '' || trim($cUsrTbl) == '' || trim($cBanTbl) == '');

	// Do the work
	if (!$error)
	{
		define('C_DB_TYPE', $cDbType);
		define('C_DB_HOST', $cDbHost);
		define('C_DB_NAME', $cDbName);
		define('C_DB_USER', $cDbUser);
		define('C_DB_PASS', $cDbPass);

		// Tables have to be created of modified
		if ($create != 0) 
		{
			include('./lib/database/' . $cDbType . '.lib.' . C_EXTENSION);
			include('./install/database/' . $cDbType . '.dump.' . C_EXTENSION);

			$dbLink = new pmcDB;
			switch ($create)
			{
				case '1':	// Udpates tables from a release older than 0.13.?
					$toDo = $updTab2;
					break;
				case '2':	// Udpates tables from a 0.13.? release
					$toDo = $updTab1;
					break;
				case '3':	// Creates table
					$toDo = $createTab;
			}
			for (reset($toDo); $query=current($toDo); next($toDo))
			{
				$dbLink->query($query);
			}
			// Optimize the tables if they have been updated
			if ($create != 3)
			{
				$dbLink->optimize($cMsgTbl);
				$dbLink->optimize($cUsrTbl);
				$dbLink->optimize($cRegTbl);
				$dbLink->optimize($cBanTbl);
			}
			$dbLink->close();
			$errorMsg = S_MAIN_2;
		} // end if ($create != 0)
		else
		{
			$errorMsg = S_MAIN_3;
		}

		$nextPage = 2;
	}
	else
	{
		$errorMsg = S_MAIN_4;
		$nextPage = 1;
	}
} // end if ($formSent == 1)


/**
 * The second of the setup pages have been submitted -> checks for values
 * submitted and do the work
 */
else if ($formSent == 2)
{
	if (!isset($cMultiLang))
		$cMultiLang = 0;
	if (!isset($cRequireRegister))
		$cRequireRegister = 0;
	if (!isset($cEmailPaswd))
		$cEmailPaswd = 0;
	if (!isset($cShowAdmin))
		$cShowAdmin = 0;
	if (!isset($cShowDelProf))
		$cShowDelProf = 0;
	if (!isset($cMsgOrder))
		$cMsgOrder = 0;
	if (!isset($cShowTimestamp))
		$cShowTimestamp = 0;
	if (!isset($cUseSmilies))
		$cUseSmilies = 0;
	if (!isset($cHtmlTagsKeep))
		$cHtmlTagsKeep = 'none';
	if (!isset($cHtmlTagsShow))
		$cHtmlTagsShow = 0;
	if (empty($cBanish))
		$cBanish = 0;
	if (!isset($cNoSwear))
		 $cNoSwear = 0;
	if (trim($cSave) == '')
		$cSave = '0';
	if (!isset($cNotify))
		$cNotify = 0;
	if (!isset($cWelcome))
		$cWelcome = 0;

	$error = true;
	if (trim($cMsgDel) == '' || trim($cUsrDel) == '' || trim($cRegDel) == '')
	{
		$errorMsg = S_MAIN_5;
	}
	else if (trim($cPubChatRooms) == '')
	{
		$errorMsg = S_MAIN_6;
	}
	else if (ereg('[\]', $cPubChatRooms) || ereg('[\]', $cPrivChatRooms))
	{
		$errorMsg = S_MAIN_7;
	}
	else if (checkRoomsNames($cPubChatRooms, $cPrivChatRooms))
	{
		$errorMsg = S_MAIN_10;
	}
	else if (trim($cTmzOffset) == '')
	{
		$errorMsg = S_MAIN_8;
	}
	else if (trim($cMsgNb) == '' || trim($cMsgRefresh) == '')
	{
		$errorMsg = S_MAIN_9;
	}
	else if (trim($cChatUrl) == '')
	{
		$errorMsg = S_MAIN_21;
	}
	else
	{
		$error = false;
		$nextPage = 3;
		$errorMsg = S_MAIN_11;
	}
	
	if ($error)
		$nextPage = 2;
} // end if ($formSent == 2)


/**
 * The third of the setup pages have been submitted -> checks for values
 * submitted and do the work
 *
 * Uses the 'pmcSlashSingleQuotes()' function defined in
 * 'chat/lib/common.lib.php3'
 */
else if ($formSent == 3)
{
	// The third setup page hasn't been skipped
	if ($submitType != S_SETUP3_12)
	{	
		$error = true;
		if (trim($admLog) == '')
		{
			$errorMsg = S_MAIN_12;
		}
		else if (ereg('[\, ]', $admLog))
		{
			$errorMsg = S_MAIN_13;
		}
		else if ($admPass == '')
		{
			$errorMsg = S_MAIN_14;
		}
		else
		{
			if (!isset($showEmail))
				$showEmail = 0;
			$error = false;
		}
	}
	else
	{
		$error = false;

	}

	if (!$error && $submitType != S_SETUP3_12)
	{	
		define('C_DB_TYPE', $cDbType);
		define('C_DB_HOST', $cDbHost);
		define('C_DB_NAME', $cDbName);
		define('C_DB_USER', $cDbUser);
		define('C_DB_PASS', $cDbPass);
		$adminPwd = md5($admPass);

		include('./lib/database/' . $cDbType . '.lib.' . C_EXTENSION);

		$dbLink = new pmcDB;
		$dbLink->query("SELECT password FROM $cRegTbl WHERE username = '" . pmcSlashSingleQuotes($admLog) . "' AND perms != 'admin' LIMIT 1");
		if (list($oldPassword) = $dbLink->nextRecord())
		{
			$dbLink->clean_results();
			if ($oldPassword != $adminPwd)
			{
				$error = true;
				$errorMsg = sprintf(S_MAIN_15, $admLog);
				$nextPage = 3;
			}
			else
			{
				if ($existAdm)
					$dbLink->query("DELETE FROM $cRegTbl WHERE perms = 'admin'");
				$dbLink->query("UPDATE $cRegTbl SET perms = 'admin' WHERE username = '" . pmcSlashSingleQuotes($admLog) . "'");
				$existAdm = true;
			}
		}
		else
		{
			$dbLink->cleanResults();
		}

		if (!$error)
		{
			if (!isset($admGender))
				$admGender = '';
			include('./lib/get_ip.lib.' . C_EXTENSION); // Set the $IP var
			if (!$existAdm)
			{
				include('./install/database/' . $cDbType . '.dump.' . C_EXTENSION);
				$admQuery = $createAdm;
			}
			else
			{
				$admQuery = "UPDATE $cRegTbl SET "
							. "username = '" . pmcSlashSingleQuotes($admLog) . "', "
						 	. "password = '" . $adminPwd . "', "
							. "firstname = '" . pmcSlashSingleQuotes($admFname) . "', "
							. "lastname = '" . pmcSlashSingleQuotes($admLname) . "', "
							. "country = '" . pmcSlashSingleQuotes($admLang) . "', "
							. "website = '" . $admWeb . "', "
							. "email = '" . $admEmail . "', "
							. "showemail = " . $showEmail . ", "
							. "reg_time = " . time() . ", "
							. "ip = '" . $ip . "', "
							. "gender = '" . $admGender . "' "
							. "WHERE perms = 'admin'";
			}

			$dbLink->query($admQuery);

			$errorMsg = S_MAIN_16;

			// Next page depends on the fact the mail() function is enabled or not
			if (!$cMailFunction)
			{
				$errorMsg	.= '<br /><br />' . S_MAIN_20;
				$cRegSender	 = '';
				$cRegEmail	 = '';
				$cAdmSender	 = '';
				$cAdmEmail	 = '';
				$nextPage	 = 5;
			}
			else
			{
				$nextPage	 = 4;
			}
		}
		$dbLink->close();
	}
	else if (!$error)
	{
		$errorMsg = S_MAIN_17;

		// Next page depends on the fact the mail() function is enabled or not
		if (!$cMailFunction)
		{
			$errorMsg	.= '<br /><br />' . S_MAIN_20;
			$cRegSender	 = '';
			$cRegEmail	 = '';
			$cAdmSender	 = '';
			$cAdmEmail	 = '';
			$nextPage	 = 5;
		}
		else
		{
			$nextPage	 = 4;
		}
	}		
	else
	{
		$nextPage = 3;
	}
} // end if ($formSent == 2)


/**
 * The fourth of the setup pages have been submitted -> checks for values
 * submitted and do the work
 */
else if ($formSent == 4)
{
	$errorMsg = S_MAIN_19;
	$nextPage = 5;
}


/**
 * Initialize the $nextPage variable if necessary
 */
if (!isset($nextPage))
	$nextPage = 0;


/**
 * Sends HTTP headers
 *
 * The 'pmcHttpHeaders()' fonction is defined in the 'chat/lib/common.lib.php3'
 * library
 */
pmcHttpHeaders(S_CHARSET, false);



/**
 * Sends the webpage
 *
 * The urlForStylesheet() function is defined in the 'chat/lib/common.lib.php3'
 * library
 */
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
<html dir="<?php echo(($charset == 'windows-1256') ? 'rtl' : 'ltr'); ?>">

<head>
<title><?php echo('phpMyChat ' . S_MAIN_18); ?></title>
<link rel="stylesheet" href="<?php echo(pmcUrlForStyleSheet('style', S_CHARSET, (defined('S_FONT_NAME')) ? S_FONT_NAME : '', S_FONT_SIZE)); ?>" type="text/css" />
</head>

<body style="background-color: #666699">
<center>
<?php
$tagClass = ((isset($error) && $error)) ? 'error' : 'whois'; 
if (!empty($errorMsg))
	echo('<p class="' . $tagClass . '">' . $errorMsg . '</p>');

include('./install/setup' . $nextPage .'.' . C_EXTENSION);
?>
</center>
</body>

</html>
--- NEW FILE ---
<?php
//
// +--------------------------------------------------------------------------+
// | phpMyChat version 0.15.0                                                 |
// +--------------------------------------------------------------------------+
// | Copyright (c) 2000-2001 The phpHeaven-team                               |
// +--------------------------------------------------------------------------+
// | This script defines the 'ignored' popups that are used to display users  |
// | whose messages aren't displayed.                                         |
// +--------------------------------------------------------------------------+
// | From the phpMyChat project:                                              |
// |    http://www.phpheaven.net/projects/phpMyChat/                          |
// |                                                                          |
// | Authors: the phpHeaven-team <php...@ya...>             |
// +--------------------------------------------------------------------------+
//
// $Id: ignore_popup.php3,v 1.1 2001/04/11 23:06:12 loic1 Exp $
//
// The 'ignored' popups.
//



/**
 * Gets the extension for the php scripts
 */
if (!isset($PHP_SELF))
	$PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
define('C_EXTENSION', (substr($PHP_SELF, -1) == 3) ? 'php3' : 'php');

/**
 * Gets some core libraries
 */
require('./config/config.lib.' . C_EXTENSION);
require('./lib/common.lib.' . C_EXTENSION);
require('./lib/database/' . C_DB_TYPE . '.lib.' . C_EXTENSION);

/**
 * Gets the values of variables sent or posted to this script
 *
 * Uses the 'pmcGrabGlobals()' function is defined in the
 * 'chat/lib/common.lib.php3' library.
 */
pmcGrabGlobals('%GET');

/**
 * Start the session handler
 */
require('./lib/db_sessions.lib.' . C_EXTENSION);
dbSessionInit(	C_DB_TYPE,
				C_DB_HOST, C_DB_NAME,
				C_DB_USER, C_DB_PASS,
				C_SESS_TBL,
				C_SESS_DEL * 60,
				C_CHAT_URL
			);
dbSessionstart();

/**
 * Defines the language to be used
 */
require('./localization/' . $dbSessionVars['lang'] . '/chat.loc');

/**
 * Sends HTTP headers
 *
 * The 'pmcHttpHeaders()' fonction is defined in the 'chat/lib/common.lib.php3'
 * library
 */
pmcHttpHeaders(L_CHARSET, false);


/**
 * Displays the frame
 *
 * Uses the 'pmcUrlForStyleSheet()' and the 'pmcSpecialChars()' functions from
 * the 'chat/lib/common.lib.php3' library 
 */
// The url for the style sheet
$cssUrl = pmcUrlForStyleSheet('style', L_CHARSET, (defined('L_FONT_NAME')) ? L_FONT_NAME : '', L_FONT_SIZE);
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
<html dir="<?php echo((L_CHARSET == 'windows-1256') ? 'rtl' : 'ltr'); ?>">

<head>
<title><?php echo(L_IGNOR_TIT); ?></title>
<link rel="stylesheet" href="<?php echo($cssUrl); ?>" type="text/css" />

<script type="text/javascript" language="javascript1.1">
<!--
/**
 * Put the focus at the message box in the input frame
 */
function pmcPutFocus()
{
	if (typeof(window.opener) != 'undefined' && window.opener && !window.opener.closed)
	{
		if (document.forms['ignoredForm'].elements['refresh'].value != 1)
			window.opener.window.parent.jsIgnoredPopupWin = null;
		window.opener.focus();
		pointTo = window.opener.frames['input'].window;
		if (pointTo && !pointTo.closed)
			pointTo.document.forms['inputForm'].elements['message'].focus();
	}
} // end of the 'pmcPutFocus()' function
// -->
</script>
</head>

<body class="frame" onunload="if (document.forms['ignoredForm'].elements['exit'].value != 1) pmcPutFocus()">
<center>
<?php
if (dbSessionIsRegistered('ignoredSenders') && $dbSessionVars['ignoredSenders'] != '')
{
	$ignoredUsers = explode(',', $dbSessionVars['ignoredSenders']);
	for ($i = 0; $i < count($ignoredUsers); $i++)
	{
		echo('-&nbsp;' . $ignoredUsers[$i] . '<br />' . "\n");
	}
}
else
{
	echo(L_IGNOR_NON . "\n");
}
?>
</center>

<?php
/**
 * The form bellow allows to check whether the popup unloads because ignored
 * users list has been modified, because the user reduced/closed it or because
 * the user exit the chat
 */
?>
<!-- Control form -->
<form action="nothing" method="post" name="ignoredForm">
	<input type="hidden" name="refresh" value="0" />
	<input type="hidden" name="exit" value="0" />
</form>
</body>

</html>
Index: whois_popup.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/whois_popup.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** whois_popup.php3	2001/04/10 16:58:34	1.5
--- whois_popup.php3	2001/04/11 23:06:12	1.6
***************
*** 155,159 ****
  <!--
  // Put the focus at the message box in the input frame
! function putFocus()
  {
  	if (typeof(window.opener) == 'undefined')
--- 155,159 ----
  <!--
  // Put the focus at the message box in the input frame
! function pmcPutFocus()
  {
  	if (typeof(window.opener) == 'undefined')
***************
*** 170,179 ****
  			document.forms['inputForm'].elements['message'].focus();
  	}
! }
  // -->
  </script>
  </head>
  
! <body class="frame" onunload="putFocus()">
  <center>
  
--- 170,179 ----
  			document.forms['inputForm'].elements['message'].focus();
  	}
! } // end of the 'pmcPutFocus()' function
  // -->
  </script>
  </head>
  
! <body class="frame" onunload="pmcPutFocus()">
  <center>
  

Index: profile_reg.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/profile_reg.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** profile_reg.php3	2001/04/10 16:58:34	1.3
--- profile_reg.php3	2001/04/11 23:06:12	1.4
***************
*** 99,103 ****
  if (isset($submitType) && $submitType == L_REG_3)
  {
! 	if (C_BAD_WORDS)
  		include('./lib/swearing.lib.' . C_EXTENSION);	
  
--- 99,103 ----
  if (isset($submitType) && $submitType == L_REG_3)
  {
! 	if (C_NO_SWEAR)
  		include('./lib/swearing.lib.' . C_EXTENSION);	
  
***************
*** 111,115 ****
  		$error = L_ERR_USR_16;
  	}
! 	else if (C_BAD_WORDS && checkWords($nick, true))
  	{
  		$error = L_ERR_USR_18;
--- 111,115 ----
  		$error = L_ERR_USR_16;
  	}
! 	else if (C_NO_SWEAR && checkWords($nick, true))
  	{
  		$error = L_ERR_USR_18;

Index: profile_edit.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/profile_edit.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** profile_edit.php3	2001/04/10 16:58:34	1.3
--- profile_edit.php3	2001/04/11 23:06:12	1.4
***************
*** 112,116 ****
  if (isset($submitType) && $submitType == L_REG_16)
  {
! 	if (C_BAD_WORDS)
  		include('./lib/swearing.lib.' . C_EXTENSION);	
  
--- 112,116 ----
  if (isset($submitType) && $submitType == L_REG_16)
  {
! 	if (C_NO_SWEAR)
  		include('./lib/swearing.lib.' . C_EXTENSION);	
  
***************
*** 124,128 ****
  		$error = L_ERR_USR_16;
  	}
! 	else if (C_BAD_WORDS && checkWords($nick, true))
  	{
  		$error = L_ERR_USR_18;
--- 124,128 ----
  		$error = L_ERR_USR_16;
  	}
! 	else if (C_NO_SWEAR && checkWords($nick, true))
  	{
  		$error = L_ERR_USR_18;

Index: input.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/input.php3,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** input.php3	2001/04/10 21:24:34	1.12
--- input.php3	2001/04/11 23:06:12	1.13
***************
*** 136,140 ****
  		{
  			include('./lib/smilies.lib.' . C_EXTENSION);
! 			checkForSmilies($enhancedMessage, $smilies);
  			unset($smilies);
  		}
--- 136,140 ----
  		{
  			include('./lib/smilies.lib.' . C_EXTENSION);
! 			pmcCheckForSmilies($enhancedMessage);
  			unset($smilies);
  		}

Index: help_popup.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/help_popup.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** help_popup.php3	2001/04/10 16:58:34	1.3
--- help_popup.php3	2001/04/11 23:06:12	1.4
***************
*** 89,93 ****
  <script type="text/javascript" language="javascript1.1">
  <!--
! function targetWin()
  {
  	if (typeof(window.opener) == 'undefined')
--- 89,100 ----
  <script type="text/javascript" language="javascript1.1">
  <!--
! /**
!  * Put the 'input' frame in an object variable
!  *
!  * @return	object	the 'input' frame object
!  *
!  * @access	private
!  */
! function pmcTargetWin()
  {
  	if (typeof(window.opener) == 'undefined')
***************
*** 99,121 ****
  	else
  		return window.opener.window;
! }
  
! function smiley2Input(code)
  {
  	window.focus();
  	if (typeof(window.opener) != 'undefined' && window.opener && !window.opener.closed)
  	{
! 		addTo = targetWin();
  		if (addTo && !addTo.closed)
  			addTo.document.forms['inputForm'].elements['message'].value += code;
  	}
! }
  
! function cmd2Input(code, addString)
  {
  	window.focus();
  	if (typeof(window.opener) != 'undefined' && window.opener && !window.opener.closed)
  	{
! 		addTo = targetWin();
  		if (addTo && !addTo.closed)
  		{
--- 106,144 ----
  	else
  		return window.opener.window;
! } // end of the 'pmcTargetWin()' function
  
! /**
!  * Add a smiley to the message box at the 'input' frame
!  *
!  * @param	string	the smiley text code
!  *
!  * @access	private
!  */
! function pmcSmiley2Input(code)
  {
  	window.focus();
  	if (typeof(window.opener) != 'undefined' && window.opener && !window.opener.closed)
  	{
! 		addTo = pmcTargetWin();
  		if (addTo && !addTo.closed)
  			addTo.document.forms['inputForm'].elements['message'].value += code;
  	}
! } // end of the 'pmcSmiley2Input()' function
  
! /**
!  * Add a command to the message box at the 'input' frame
!  *
!  * @param	string	the smiley text code
!  * @param	boolean	whether to append the existing text in the message box to
!  * 					the command or to replace the former by the later
!  *
!  * @access	private
!  */
! function pmcCmd2Input(code, addString)
  {
  	window.focus();
  	if (typeof(window.opener) != 'undefined' && window.opener && !window.opener.closed)
  	{
! 		addTo = pmcTargetWin();
  		if (addTo && !addTo.closed)
  		{
***************
*** 126,130 ****
  		}
  	}
! }
  //-->
  </script>
--- 149,153 ----
  		}
  	}
! } // end of the 'pmcCmd2Input()' function
  //-->
  </script>
***************
*** 139,145 ****
  {
  	include('./lib/smilies.lib.' . C_EXTENSION);
! 	$smiliesCnt = count($smilies);
! 	$smiliesCodes = array();
! 	displaySmilies($smiliesCodes, $smilies, $smiliesCnt, 'help');
  	unset($smilies);
  	?>
--- 162,167 ----
  {
  	include('./lib/smilies.lib.' . C_EXTENSION);
! 	$smiliesCodes	= pmcDisplaySmilies('help');
! 	$smiliesCnt		= count($smilies);
  	unset($smilies);
  	?>
***************
*** 192,201 ****
  	<tr><th align="center" class="tabtitle" colspan="2"><?php echo(L_HELP_TIT_3); ?></th></tr>
  	<tr><th align="center" colspan="2"><?php echo(L_HELP_CMD_0); ?></th></tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/!', false); return false" class="sender">/!</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
  		<td><?php echo(L_HELP_CMD_7); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/ANNOUNCE', true); return false" class="sender">/announce {<?php echo(L_HELP_MSG); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
--- 214,223 ----
  	<tr><th align="center" class="tabtitle" colspan="2"><?php echo(L_HELP_TIT_3); ?></th></tr>
  	<tr><th align="center" colspan="2"><?php echo(L_HELP_CMD_0); ?></th></tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/!', false); return false" class="sender">/!</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
  		<td><?php echo(L_HELP_CMD_7); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/ANNOUNCE', true); return false" class="sender">/announce {<?php echo(L_HELP_MSG); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
***************
*** 206,210 ****
  {
  	?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/BAN', true); return false" class="sender">/ban <bdo dir="<?php echo($textDirection); ?>">[*]</bdo> {<?php echo(L_HELP_USR); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
--- 228,232 ----
  {
  	?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/BAN', true); return false" class="sender">/ban <bdo dir="<?php echo($textDirection); ?>">[*]</bdo> {<?php echo(L_HELP_USR); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
***************
*** 219,223 ****
  	echo("\n");
  	?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/CLEAR', false); return false" class="sender">/clear</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
--- 241,245 ----
  	echo("\n");
  	?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/CLEAR', false); return false" class="sender">/clear</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
***************
*** 228,237 ****
  echo("\n");
  ?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/IGNORE', true); return false" class="sender">/ignore <bdo dir="<?php echo($textDirection); ?>">[-]</bdo> <?php echo('[' . L_HELP_USR . '[,' . L_HELP_USR . '...]]'); ?></a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
  		<td><?php echo(L_HELP_CMD_6); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/INVITE', true); return false" class="sender">/invite {<?php echo(L_HELP_USR); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
--- 250,259 ----
  echo("\n");
  ?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/IGNORE', true); return false" class="sender">/ignore <bdo dir="<?php echo($textDirection); ?>">[-]</bdo> <?php echo('[' . L_HELP_USR . '[,' . L_HELP_USR . '...]]'); ?></a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
  		<td><?php echo(L_HELP_CMD_6); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/INVITE', true); return false" class="sender">/invite {<?php echo(L_HELP_USR); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
***************
*** 242,246 ****
  {
  	?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/JOIN', true); return false" class="sender">/join <bdo dir="<?php echo($textDirection); ?>">[n]</bdo> {#<?php echo(L_HELP_ROOM); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
--- 264,268 ----
  {
  	?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/JOIN', true); return false" class="sender">/join <bdo dir="<?php echo($textDirection); ?>">[n]</bdo> {#<?php echo(L_HELP_ROOM); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
***************
*** 251,260 ****
  echo("\n");
  ?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/KICK', true); return false" class="sender">/kick {<?php echo(L_HELP_USR); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
  		<td><?php echo(L_HELP_CMD_9); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/ME', true); return false" class="sender">/me {<?php echo(L_HELP_MSG); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
--- 273,282 ----
  echo("\n");
  ?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/KICK', true); return false" class="sender">/kick {<?php echo(L_HELP_USR); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
  		<td><?php echo(L_HELP_CMD_9); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/ME', true); return false" class="sender">/me {<?php echo(L_HELP_MSG); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
***************
*** 262,267 ****
  	</tr>
  	<tr><th align="<?php echo($cellAlign); ?>" colspan="2">
! 		<a href="#" onclick="cmd2Input('/MSG', true); return false" class="sender">/msg <?php echo('{' . L_HELP_USR . '} {' . L_HELP_MSG .'}'); ?></a><br />
! 		<a href="#" onclick="cmd2Input('/TO', true); return false" class="sender">/to <?php echo('{' . L_HELP_USR . '} {' . L_HELP_MSG . '}'); ?></a>
  	</th></tr>
  	<tr>
--- 284,289 ----
  	</tr>
  	<tr><th align="<?php echo($cellAlign); ?>" colspan="2">
! 		<a href="#" onclick="pmcCmd2Input('/MSG', true); return false" class="sender">/msg <?php echo('{' . L_HELP_USR . '} {' . L_HELP_MSG .'}'); ?></a><br />
! 		<a href="#" onclick="pmcCmd2Input('/TO', true); return false" class="sender">/to <?php echo('{' . L_HELP_USR . '} {' . L_HELP_MSG . '}'); ?></a>
  	</th></tr>
  	<tr>
***************
*** 269,273 ****
  		<td><?php echo(L_HELP_CMD_10); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/NOTIFY', false); return false" class="sender">/notify</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
--- 291,295 ----
  		<td><?php echo(L_HELP_CMD_10); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/NOTIFY', false); return false" class="sender">/notify</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
***************
*** 278,282 ****
  {
  	?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/ORDER', false); return false" class="sender">/order</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
--- 300,304 ----
  {
  	?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/ORDER', false); return false" class="sender">/order</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
***************
*** 287,296 ****
  echo("\n");
  ?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/PROFILE', false); return false" class="sender">/profile</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
  		<td><?php echo(L_HELP_CMD_12); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/PROMOTE', true); return false" class="sender">/promote {<?php echo(L_HELP_USR); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
--- 309,318 ----
  echo("\n");
  ?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/PROFILE', false); return false" class="sender">/profile</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
  		<td><?php echo(L_HELP_CMD_12); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/PROMOTE', true); return false" class="sender">/promote {<?php echo(L_HELP_USR); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
***************
*** 298,304 ****
  	</tr>
  	<tr><th align="<?php echo($cellAlign); ?>" colspan="2">
! 		<a href="#" onclick="cmd2Input('/QUIT', true); return false" class="sender">/quit [<?php echo(L_HELP_MSG); ?>]</a><br />
! 		<a href="#" onclick="cmd2Input('/EXIT', true); return false" class="sender">/exit [<?php echo(L_HELP_MSG); ?>]</a><br />
! 		<a href="#" onclick="cmd2Input('/BYE', true); return false" class="sender">/bye [<?php echo(L_HELP_MSG); ?>]</a>
  	</th></tr>
  	<tr>
--- 320,326 ----
  	</tr>
  	<tr><th align="<?php echo($cellAlign); ?>" colspan="2">
! 		<a href="#" onclick="pmcCmd2Input('/QUIT', true); return false" class="sender">/quit [<?php echo(L_HELP_MSG); ?>]</a><br />
! 		<a href="#" onclick="pmcCmd2Input('/EXIT', true); return false" class="sender">/exit [<?php echo(L_HELP_MSG); ?>]</a><br />
! 		<a href="#" onclick="pmcCmd2Input('/BYE', true); return false" class="sender">/bye [<?php echo(L_HELP_MSG); ?>]</a>
  	</th></tr>
  	<tr>
***************
*** 306,310 ****
  		<td><?php echo(L_HELP_CMD_5); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/REFRESH', true); return false" class="sender">/refresh <bdo dir="<?php echo($textDirection); ?>">[n]</bdo></a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
--- 328,332 ----
  		<td><?php echo(L_HELP_CMD_5); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/REFRESH', true); return false" class="sender">/refresh <bdo dir="<?php echo($textDirection); ?>">[n]</bdo></a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
***************
*** 315,319 ****
  {
  	?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/SAVE', true); return false" class="sender">/save <bdo dir="<?php echo($textDirection); ?>">[n]</bdo></a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
--- 337,341 ----
  {
  	?>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/SAVE', true); return false" class="sender">/save <bdo dir="<?php echo($textDirection); ?>">[n]</bdo></a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
***************
*** 325,329 ****
  ?>
  	<tr><th align="<?php echo($cellAlign); ?>" colspan="2">
! 		<a href="#" onclick="cmd2Input('/SHOW', true); return false" class="sender">/show <bdo dir="<?php echo($textDirection); ?>">[n]</bdo></a>
  <?php
  if ($jsVersion == 'high')
--- 347,351 ----
  ?>
  	<tr><th align="<?php echo($cellAlign); ?>" colspan="2">
! 		<a href="#" onclick="pmcCmd2Input('/SHOW', true); return false" class="sender">/show <bdo dir="<?php echo($textDirection); ?>">[n]</bdo></a>
  <?php
  if ($jsVersion == 'high')
***************
*** 331,335 ****
  	?>
  		<br />
! 		<a href="#" onclick="cmd2Input('/LAST', true); return false" class="sender">/last <bdo dir="<?php echo($textDirection); ?>">[n]</bdo></a>
  	<?php
  }
--- 353,357 ----
  	?>
  		<br />
! 		<a href="#" onclick="pmcCmd2Input('/LAST', true); return false" class="sender">/last <bdo dir="<?php echo($textDirection); ?>">[n]</bdo></a>
  	<?php
  }
***************
*** 341,350 ****
  		<td><?php echo(($jsVersion == 'high') ? L_HELP_CMD_1b : L_HELP_CMD_1a); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/TIMESTAMP', false); return false" class="sender">/timestamp</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
  		<td><?php echo(L_HELP_CMD_8); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="cmd2Input('/WHOIS', true); return false" class="sender">/whois {<?php echo(L_HELP_USR); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
--- 363,372 ----
  		<td><?php echo(($jsVersion == 'high') ? L_HELP_CMD_1b : L_HELP_CMD_1a); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/TIMESTAMP', false); return false" class="sender">/timestamp</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>
  		<td><?php echo(L_HELP_CMD_8); ?></td>
  	</tr>
! 	<tr><th align="<?php echo($cellAlign); ?>" colspan="2"><a href="#" onclick="pmcCmd2Input('/WHOIS', true); return false" class="sender">/whois {<?php echo(L_HELP_USR); ?>}</a></th></tr>
  	<tr>
  		<td width="10">&nbsp;</td>

Index: handle_input.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/handle_input.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** handle_input.php3	2001/04/10 21:24:34	1.10
--- handle_input.php3	2001/04/11 23:06:12	1.11
***************
*** 137,141 ****
  		{
  			include('./lib/smilies.lib.' . C_EXTENSION);
! 			checkForSmilies($enhancedMessage, $smilies);
  			unset($smilies);
  		}
--- 137,141 ----
  		{
  			include('./lib/smilies.lib.' . C_EXTENSION);
! 			pmcCheckForSmilies($enhancedMessage);
  			unset($smilies);
  		}