[phpMyChat CVS] CVS: phpMyChat-0.15/chat/lib/index_libs set_msg_color.lib.js,1.2,1.3 main_index.lib.php3,1.16,1.17 do_enter_js_work.lib.php3,1.2,1.3 do_enter_frameset.lib.php3,1.2,1.3 do_enter_db_work.lib.php3,1.9,1.10 connect_state.lib.js,1.3,1.4

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

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

Modified Files:
	set_msg_color.lib.js main_index.lib.php3 
	do_enter_js_work.lib.php3 do_enter_frameset.lib.php3 
	do_enter_db_work.lib.php3 connect_state.lib.js 
Log Message:
Too many changes to detail...

Index: set_msg_color.lib.js
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/set_msg_color.lib.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** set_msg_color.lib.js	2001/04/17 19:45:53	1.2
--- set_msg_color.lib.js	2001/04/18 20:10:55	1.3
***************
*** 67,71 ****
  
  	// Buffers the color picker
! 	jsColorPicker	= new Array();
  	for (var i = 0; i < jsTextColors.length; i++)
  	{
--- 67,73 ----
  
  	// Buffers the color picker
! 	jsColorPicker		= new Array();
! 	jsColorPicker[0]	= '<table border="0" cellpadding="0" cellspacing="0">';
! 	jsColorPicker[1]	= '<tr>';
  	for (var i = 0; i < jsTextColors.length; i++)
  	{
***************
*** 79,84 ****
  			var jsWichImage	= 'unsel_color.gif';
  		}
! 		jsColorPicker[i] = '<td bgcolor="' + jsTextColors[i] + '"><a href="#" onclick="window.parent.pmcChangeColor(\'' + jsTextColors[i] + '\', \'C' + (i + 1) + '\'); return false"><img src="images/' + jsWichImage + '" alt="' + jsTextColors[i] + '" name="C' + (i + 1) + '" border="0" width="2" height="20" /></a></td>';
  	}
  	jsTextColors = null;
  
--- 81,88 ----
  			var jsWichImage	= 'unsel_color.gif';
  		}
! 		jsColorPicker[i+2]	= '<td bgcolor="' + jsTextColors[i] + '"><a href="#" onclick="window.parent.pmcChangeColor(\'' + jsTextColors[i] + '\', \'C' + (i + 1) + '\'); return false"><img src="images/' + jsWichImage + '" alt="' + jsTextColors[i] + '" name="C' + (i + 1) + '" id="C' + (i + 1) + '" border="0" width="2" height="20" /></a></td>';
  	}
+ 	jsColorPicker[i+2]	= '<\/tr>';
+ 	jsColorPicker[i+3]	= '<\/table>';
  	jsTextColors = null;
  
***************
*** 103,111 ****
  	{
  		var inputDoc = window.frames['input'].window.document;
! 		if (typeof(document.all) != 'undefined')
  		{
  			var obj1 = inputDoc.all[jsSelectedColor];
  			var obj2 = inputDoc.all[colorRank];
  		}
  		else if (typeof(document.images) != 'undefined')
  		{
--- 107,123 ----
  	{
  		var inputDoc = window.frames['input'].window.document;
! 		// DOM enabled browser
! 		if (typeof(document.getElementById) != 'undefined')
  		{
+ 			var obj1	= inputDoc.getElementById(jsSelectedColor);
+ 			var obj2	= inputDoc.getElementById(colorRank);
+ 		}
+ 		// IE
+ 		else if (typeof(document.all) != 'undefined')
+ 		{
  			var obj1 = inputDoc.all[jsSelectedColor];
  			var obj2 = inputDoc.all[colorRank];
  		}
+ 		// NS
  		else if (typeof(document.images) != 'undefined')
  		{
***************
*** 113,117 ****
  			var obj2 = inputDoc.images[colorRank];
  		}
! 		else return;
  
  		if (jsSelectedColor != null)
--- 125,130 ----
  			var obj2 = inputDoc.images[colorRank];
  		}
! 		else
! 			return false;
  
  		if (jsSelectedColor != null)

Index: main_index.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/main_index.lib.php3,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** main_index.lib.php3	2001/04/16 12:31:36	1.16
--- main_index.lib.php3	2001/04/18 20:10:55	1.17
***************
*** 448,454 ****
  var jsUrlArgSeparator	= '<?php echo($GLOBALS['pmcQueryArgSeparator']); ?>';
  
  var jsIsNS4				= (typeof(document.layers) != 'undefined') ? 1 : 0;
! var jsIsIE4				= ((typeof(document.all) != 'undefined') && (parseInt(navigator.appVersion) >=4 )) ? 1 : 0;
! var jsWhichVersion		= (jsIsNS4 || jsIsIE4) ? 'high' : 'low';
  var jsIsJs11			= (typeof(window.focus) != 'undefined');
  
--- 448,455 ----
  var jsUrlArgSeparator	= '<?php echo($GLOBALS['pmcQueryArgSeparator']); ?>';
  
+ var jsIsDOM				= (typeof(document.getElementById) != 'undefined') ? 1 : 0;
+ var jsIsIE4				= ((typeof(document.all) != 'undefined') && (parseInt(navigator.appVersion) >= 4)) ? 1 : 0;
  var jsIsNS4				= (typeof(document.layers) != 'undefined') ? 1 : 0;
! var jsWhichVersion		= (jsIsDOM ||jsIsIE4 || jsIsNS4) ? 'high' : 'low';
  var jsIsJs11			= (typeof(window.focus) != 'undefined');
  
***************
*** 522,529 ****
  		$layoutRoomType = '';
  	?>
  <table align="center" cellpadding="5" class="chatBody">
  <tr>
! 	<td class="chatBody">
! 		<center>
  
  		<!-- Title and messages -->
--- 523,530 ----
  		$layoutRoomType = '';
  	?>
+ <center>
  <table align="center" cellpadding="5" class="chatBody">
  <tr>
! 	<td class="chatBody" align="center">
  
  		<!-- Title and messages -->
***************
*** 760,764 ****
  		{
  			$room = pmcHandleMagicQuotes($room, '', 1, 'del');
! 			if (pmcIsInto($room, stripslashes($defaultRoomsString)) < 0)
  			{
  				echo("\t\t\t\t\t\t\t");
--- 761,765 ----
  		{
  			$room = pmcHandleMagicQuotes($room, '', 1, 'del');
! 			if (pmcIsInto($room, $defaultRoomsString) < 0)
  			{
  				echo("\t\t\t\t\t\t\t");
***************
*** 810,822 ****
  		<!-- Copyright -->
  		<span class="chatCopy" dir="ltr">
! 			&copy; 2000 <a href="http://www.phpheaven.net/" class="chatLink">The phpHeaven Team</a>
  		</span>
  
  		</form>
  
- 		</center>
  	</td>
  </tr>
  </table>
  
  <?php
--- 811,823 ----
  		<!-- Copyright -->
  		<span class="chatCopy" dir="ltr">
! 			&copy; 2000-2001 <a href="http://www.phpheaven.net/" class="chatLink">The phpHeaven Team</a>
  		</span>
  
  		</form>
  
  	</td>
  </tr>
  </table>
+ </center>
  
  <?php

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.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** do_enter_js_work.lib.php3	2001/04/04 16:23:13	1.2
--- do_enter_js_work.lib.php3	2001/04/18 20:10:55	1.3
***************
*** 32,39 ****
  var jsChatPath			= '<?php echo(_CHAT_PATH); ?>';
  var jsDbSessionSID		= '<?php echo(dbSessionSID('GET')); ?>';
  
! var jsIsNS4				= (typeof(document.layers) != 'undefined') ? 1 : 0;
  var jsIsIE4				= ((typeof(document.all) != 'undefined') && (parseInt(navigator.appVersion) >= 4)) ? 1 : 0;
! var jsIsVersion4		= (jsIsNS4 || jsIsIE4) ? 1 : 0;
  var jsIsJs11			= (typeof(window.focus) != 'undefined');
  
--- 32,41 ----
  var jsChatPath			= '<?php echo(_CHAT_PATH); ?>';
  var jsDbSessionSID		= '<?php echo(dbSessionSID('GET')); ?>';
+ var jsQueryArgSeparator	= '<?php echo($pmcQueryArgSeparator); ?>';
  
! var jsIsDOM				= (typeof(document.getElementById) != 'undefined') ? 1 : 0;
  var jsIsIE4				= ((typeof(document.all) != 'undefined') && (parseInt(navigator.appVersion) >= 4)) ? 1 : 0;
! var jsIsNS4				= (typeof(document.layers) != 'undefined') ? 1 : 0;
! var jsIsVersion4		= (jsIsDOM ||jsIsIE4 || jsIsNS4) ? 1 : 0;
  var jsIsJs11			= (typeof(window.focus) != 'undefined');
  
***************
*** 96,123 ****
  {
  	?>
- <!-- Required to enforce reloading of the 'loader' frame -->
- <script type="text/javascript" language="javascript">
- <!--
- var jsIsInitLoad			= 1;
- var jsLastLoadedMsgTime		= 0;
- var jsLastCheckedUserTime	= 0;
- 
- if (typeof(location.replace) == 'undefined')	// Emulates the replace method
- 	location.replace = location.assign;
- 
- // Refreshes the 'loader' frame
- function pmcDoRefreshLoader()
- {
- 	var jsLoaderUrl	= 'loader.<?php echo(C_EXTENSION); ?>'
- 					+ '?<?php echo(dbSessionSID()); ?>'
- 					+ '<?php echo($pmcQueryArgSeparator); ?>isInitLoad=' + jsIsInitLoad
- 					+ '<?php echo($pmcQueryArgSeparator); ?>lastMsgLoad=' + jsLastLoadedMsgTime
- 					+ '<?php echo($pmcQueryArgSeparator); ?>lastUsrCheck=' + jsLastCheckedUserTime;
- 	window.frames['loader'].window.location.replace(jsLoaderUrl);
- }
- // -->
- </script>
- 
- 
  <!-- Gets the libraries for collapsible list and connection state -->
  <script src="<?php echo(_CHAT_PATH); ?>lib/index_libs/users.lib.js" type="text/javascript" language="javascript1.2"></script>
--- 98,101 ----

Index: do_enter_frameset.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/do_enter_frameset.lib.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** do_enter_frameset.lib.php3	2001/04/04 08:36:06	1.2
--- do_enter_frameset.lib.php3	2001/04/18 20:10:55	1.3
***************
*** 59,63 ****
  			<frameset rows="80,*,50" frameborder="0" border="0" framespacing="0">
  				<frame src="<?php echo(_CHAT_PATH); ?>exit.<?php echo(C_EXTENSION . '?' . dbSessionSID('GET')); ?>" name="exit" frameborder="0" border="0" framespacing="0" marginwidth=3 marginheight=3 scrolling="no" />
! 				<frame src="<?php echo(_CHAT_PATH); ?>users.<?php echo(C_EXTENSION . '?' . dbSessionSID('GET')); ?>" name="users" frameborder="0" border="0" framespacing="0" marginwidth=3 marginheight=3 />
  				<frame src="<?php echo(_CHAT_PATH); ?>link.php3" name="link" frameborder="0" border="0" framespacing="0" marginwidth=0 marginheight=0 scrolling="no" />
  			</frameset>
--- 59,63 ----
  			<frameset rows="80,*,50" frameborder="0" border="0" framespacing="0">
  				<frame src="<?php echo(_CHAT_PATH); ?>exit.<?php echo(C_EXTENSION . '?' . dbSessionSID('GET')); ?>" name="exit" frameborder="0" border="0" framespacing="0" marginwidth=3 marginheight=3 scrolling="no" />
! 				<frame src="<?php echo(_CHAT_PATH); ?>blank.htm" name="users" frameborder="0" border="0" framespacing="0" marginwidth=3 marginheight=3 />
  				<frame src="<?php echo(_CHAT_PATH); ?>link.php3" name="link" frameborder="0" border="0" framespacing="0" marginwidth=0 marginheight=0 scrolling="no" />
  			</frameset>
***************
*** 68,72 ****
  
  		<!-- Hidden frame for the loader -->
! 		<frame src="<?php echo($loaderUrl); ?>" name="loader" frameborder="0" border="0" framespacing="0" marginheight="0" marginwidth="0" scrolling="no" />
  	</frameset>
  	<?php
--- 68,72 ----
  
  		<!-- Hidden frame for the loader -->
! 		<frame src="<?php echo(_CHAT_PATH); ?>blank.htm" name="loader" frameborder="0" border="0" framespacing="0" marginheight="0" marginwidth="0" scrolling="no" />
  	</frameset>
  	<?php

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.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** do_enter_db_work.lib.php3	2001/04/13 19:30:55	1.9
--- do_enter_db_work.lib.php3	2001/04/18 20:10:55	1.10
***************
*** 238,241 ****
--- 238,244 ----
  $dbSessionVars['showTimestamp']		= $showTimestamp;
  $dbSessionVars['notify']			= $notify;
+ // bypass the 'check and kick' tests at the beginning of the 'messages.php3',
+ // 'loader.php3' and 'input.php3' scripts if they are called for the first time
+ $dbSessionVars['noKickTest']		= 1;
  dbSessionSave();
  unset($keptLang);

Index: connect_state.lib.js
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/connect_state.lib.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** connect_state.lib.js	2001/04/17 19:46:31	1.3
--- connect_state.lib.js	2001/04/18 20:10:55	1.4
***************
*** 24,40 ****
  
  
! var jsImgConnectOff	= new Image(13,13);
! jsImgConnectOff.src	= jsChatPath + 'images/connect_off.gif';
! var jsImgConnectOn	= new Image(13,13);
! jsImgConnectOn.src	= jsChatPath + 'images/connect_on.gif';
! var jsImgConnectErr	= new Image(13,13);
! jsImgConnectErr.src	= jsChatPath + 'images/connect_error.gif';
! var jsImgConnect	= new Image(13,13);
! 
! var jsLeaveChat		= false;
! var jsConnect		= 0;
! var jsIsConnecting	= null;
  
  
  /**
   * Tries to connect twice if necessary and sets the icon for connection status
--- 24,47 ----
  
  
! var jsImgConnectOff			= new Image(13,13);
! jsImgConnectOff.src			= jsChatPath + 'images/connect_off.gif';
! var jsImgConnectOn			= new Image(13,13);
! jsImgConnectOn.src			= jsChatPath + 'images/connect_on.gif';
! var jsImgConnectErr			= new Image(13,13);
! jsImgConnectErr.src			= jsChatPath + 'images/connect_error.gif';
! var jsImgConnect			= new Image(13,13);
! 
! var jsLeaveChat				= false;
! var jsConnect				= 0;
! var jsIsConnecting			= null;
! 
! var jsIsInitLoad			= 1;
! var jsLastLoadedMsgTime		= 0;
! var jsLastCheckedUserTime	= 0;
  
+ if (typeof(location.replace) == 'undefined')	// Emulates the replace method
+ 	location.replace		= location.assign;
  
+ 
  /**
   * Tries to connect twice if necessary and sets the icon for connection status
***************
*** 60,70 ****
  	}
  
! 	if (typeof(document.all) != 'undefined')
  	{
! 		exitFrm.document.all['imgConState'].src		= jsImgConnect.src;
  	}
  	else if (typeof(document.images) != 'undefined')
  	{
! 		exitFrm.document.images['imgConState'].src	= jsImgConnect.src;
  	}
  
--- 67,81 ----
  	}
  
! 	if (typeof(document.getElementById) != 'undefined')
! 	{
! 		exitFrm.document.getElementById('imgConState').src	= jsImgConnect.src;
! 	}
! 	else if (typeof(document.all) != 'undefined')
  	{
! 		exitFrm.document.all['imgConState'].src				= jsImgConnect.src;
  	}
  	else if (typeof(document.images) != 'undefined')
  	{
! 		exitFrm.document.images['imgConState'].src			= jsImgConnect.src;
  	}
  
***************
*** 97,109 ****
  		clearTimeout(jsIsConnecting);
  
! 	if (typeof(document.all) != 'undefined')
  	{
  		if (typeof(exitFrm.document.all['imgConState']) != 'undefined')
! 			exitFrm.document.all['imgConState'].src		= jsImgConnectOff.src;
  	}
  	else if (typeof(document.images) != 'undefined')
  	{
  		if (typeof(exitFrm.document.images['imgConState']) != 'undefined')
! 			exitFrm.document.images['imgConState'].src	= jsImgConnectOff.src;
  	}
  	else return;
--- 108,125 ----
  		clearTimeout(jsIsConnecting);
  
! 	if (typeof(document.getElementById) != 'undefined')
! 	{
! 		if (typeof(exitFrm.document.getElementById('imgConState')) != 'undefined')
! 			exitFrm.document.getElementById('imgConState').src	= jsImgConnectOff.src;
! 	}
! 	else if (typeof(document.all) != 'undefined')
  	{
  		if (typeof(exitFrm.document.all['imgConState']) != 'undefined')
! 			exitFrm.document.all['imgConState'].src				= jsImgConnectOff.src;
  	}
  	else if (typeof(document.images) != 'undefined')
  	{
  		if (typeof(exitFrm.document.images['imgConState']) != 'undefined')
! 			exitFrm.document.images['imgConState'].src			= jsImgConnectOff.src;
  	}
  	else return;
***************
*** 112,115 ****
--- 128,145 ----
  
  /**
+  * Refreshes the 'loader' frame
+  */
+ function pmcDoRefreshLoader()
+ {
+ 	var jsLoaderUrl	= 'loader.' + jsPhpExt
+ 					+ '?' + jsDbSessionSID
+ 					+ jsQueryArgSeparator + 'isInitLoad=' + jsIsInitLoad
+ 					+ jsQueryArgSeparator + 'lastMsgLoad=' + jsLastLoadedMsgTime
+ 					+ jsQueryArgSeparator + 'lastUsrCheck=' + jsLastCheckedUserTime;
+ 	window.frames['loader'].window.location.replace(jsLoaderUrl);
+ } // end of the 'pmcDoRefreshLoader()' function
+ 
+ 
+ /**
   * Enforces a new connection try (used when the user click on the 'connection
   * status' icon at the exit frame)
***************
*** 123,131 ****
  		// 'chat/lib/index_libs/main_index.lib.php3' script
  		pmcDoRefreshLoader();
! 		with (window.parent.frames['input'].window.document.forms['inputForm'])
  		{
! 			elements['sent'].value				= '0';
! 			if (typeof(elements['submitType'].disabled) != 'undefined')
! 				elements['submitType'].disabled	= false;
  		}	
  	}
--- 153,162 ----
  		// 'chat/lib/index_libs/main_index.lib.php3' script
  		pmcDoRefreshLoader();
! 		var inputForm = pmcGetInputForm();
! 		if (inputForm != null)
  		{
! 			inputForm.elements['sent'].value				= '0';
! 			if (typeof(inputForm.elements['submitType'].disabled) != 'undefined')
! 				inputForm.elements['submitType'].disabled	= false;
  		}	
  	}