[phpMyChat CVS] CVS: phpMyChat-0.15/chat users_popup.php3,1.9,1.10 users.php3,1.14,1.15 messages_low.php3,1.9,1.10 loader.php3,1.10,1.11 input.php3,1.19,1.20 exit.php3,1.9,1.10

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

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

Modified Files:
	users_popup.php3 users.php3 messages_low.php3 loader.php3 
	input.php3 exit.php3 
Log Message:
Too many changes to detail...

Index: users_popup.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users_popup.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** users_popup.php3	2001/04/16 12:24:29	1.9
--- users_popup.php3	2001/04/18 20:10:55	1.10
***************
*** 220,224 ****
  			$usersList[]		= '<div id="Parent' . $id . '" class="parent" style="margin-top: 5px; cursor: hand">';
  			$usersList[]		= "\t" . '<a href="#" onclick="pmcExpandRoom(\'' . $id . '\'); return false">'
! 								. '<img name="imEx" src="images/closed.gif" width="9" height="9" border="0" alt="' . L_EXPCOL . '" /></a>'
  								. '&nbsp;'
  								. '<b>' . htmlspecialchars($roomName) . '</b>'
--- 220,224 ----
  			$usersList[]		= '<div id="Parent' . $id . '" class="parent" style="margin-top: 5px; cursor: hand">';
  			$usersList[]		= "\t" . '<a href="#" onclick="pmcExpandRoom(\'' . $id . '\'); return false">'
! 								. '<img name="imEx" id="imEx' . $id . '" src="images/closed.gif" width="9" height="9" border="0" alt="' . L_EXPCOL . '" /></a>'
  								. '&nbsp;'
  								. '<b>' . htmlspecialchars($roomName) . '</b>'
***************
*** 313,317 ****
  	<p>
  		<a href="#" onclick="pmcExpandAll(); return false">
! 			<img name="imgExpandAll" src="images/closed_big.gif" width="13" height="13" align="middle" border="0" alt="<?php echo(L_EXPCOL_ALL); ?>" /></a>
  		&nbsp;
  		<a href="<?php echo($beepLinkUrl); ?>">
--- 313,317 ----
  	<p>
  		<a href="#" onclick="pmcExpandAll(); return false">
! 			<img name="imgExpandAll" id="imgExpandAll" src="images/closed_big.gif" width="13" height="13" align="middle" border="0" alt="<?php echo(L_EXPCOL_ALL); ?>" /></a>
  		&nbsp;
  		<a href="<?php echo($beepLinkUrl); ?>">

Index: users.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users.php3,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** users.php3	2001/04/16 12:48:30	1.14
--- users.php3	2001/04/18 20:10:55	1.15
***************
*** 292,296 ****
  			$usersList[]	= '<div id="Parent' . $id . '" class="parent" style="margin-top: 5px; cursor: hand">';
  			$usersList[]	= "\t" . '<a href="#" onclick="window.parent.pmcExpandRoom(\'' . $id . '\'); return false">'
! 							. '<img name="imEx" src="images/closed.gif" width="9" height="9" border="0" alt="' . L_EXPCOL . '" /></a>'
  							. '&nbsp;'
  							. '<a href="' . str_replace('%NEW ROOM%', urlencode($roomName), $joinUrl) . '" target="_parent">' . htmlspecialchars($roomName) . '</a>'
--- 292,296 ----
  			$usersList[]	= '<div id="Parent' . $id . '" class="parent" style="margin-top: 5px; cursor: hand">';
  			$usersList[]	= "\t" . '<a href="#" onclick="window.parent.pmcExpandRoom(\'' . $id . '\'); return false">'
! 							. '<img name="imEx" id="imEx' . $id . '" src="images/closed.gif" width="9" height="9" border="0" alt="' . L_EXPCOL . '" /></a>'
  							. '&nbsp;'
  							. '<a href="' . str_replace('%NEW ROOM%', urlencode($roomName), $joinUrl) . '" target="_parent">' . htmlspecialchars($roomName) . '</a>'
***************
*** 402,417 ****
  if (window.parent.jsIsVersion4)
  {
! 	document.write('<style type="text/css">');
! 	if (window.parent.jsIsNS4)
  	{
! 		document.write('.parent {position: absolute; visibility: visible}');
! 		document.write('.child {position: absolute; visibility: visible}');
! 		document.write('.regular {position: absolute; visibility: visible}')
! 	}
! 	else
! 	{
! 		document.write('.child {display: none}')
  	}
- 	document.write('<\/style>');
  }
  
--- 402,434 ----
  if (window.parent.jsIsVersion4)
  {
! 	with (document)
  	{
! 		// This is a fix for Mozilla that do not treat text between <style>
!     	// tags as style information unless it is written with the one call to
! 		// write()
! 		if (window.parent.jsIsDOM)
! 		{
! 			var theCss	= '<style type="text/css">'
! 						+ '.parent {display:block}'
! 						+ '.child {display:none}'
! 						+ '<\/style>';
! 			write(theCss);
! 		}
! 		else
! 		{
! 			write('<style type="text/css">');
! 			if (window.parent.jsIsIE4)
! 			{
! 				write('.child {display:none}');
! 			}
! 			else
! 			{
! 				write('.parent {position:absolute; visibility:visible}');
! 				write('.child {position:absolute; visibility:visible}');
! 				write('.regular {position:absolute; visibility:visible}');
! 			}
! 			write('<\/style>');
! 		}
  	}
  }
  
***************
*** 419,423 ****
  function pmcGetY()
  {
! 	window.parent.jsUsersY = (window.parent.jsIsNS4) ? window.pageYOffset : document.body.scrollTop;
  } // end of the 'pmcGetY()' function
  
--- 436,443 ----
  function pmcGetY()
  {
! 	if (typeof(window.pageYOffset) != 'undefined')
! 		window.parent.jsUsersY = window.pageYOffset;
! 	else if (typeof(document.body.scrollTop) != 'undefined')
! 		window.parent.jsUsersY = document.body.scrollTop;
  } // end of the 'pmcGetY()' function
  
***************
*** 452,456 ****
  	?>
  // Set the table containing number of users per 'others' rooms
! window.parent.jsChildCnt = new Array;
  	<?php
  	while(list($key, $cnt) = each($childCnt))
--- 472,476 ----
  	?>
  // Set the table containing number of users per 'others' rooms
! window.parent.jsChildCnt = new Array();
  	<?php
  	while(list($key, $cnt) = each($childCnt))

Index: messages_low.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/messages_low.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** messages_low.php3	2001/04/14 17:51:47	1.9
--- messages_low.php3	2001/04/18 20:10:55	1.10
***************
*** 58,63 ****
  dbSessionStart();
  dbSessionUpdateLogTime();
- $dbSessionDbLink->close();
- unset($dbSessionDbLink);
  
  /**
--- 58,61 ----
***************
*** 78,87 ****
  /**
   * Gets/Updates the users' informations from/in the connected users table
   */
  $slashedNick			= pmcSlashSingleQuotes($dbSessionVars['nick']);
  $currentRoomType		= $dbSessionVars['roomType'];
  $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
! require('./lib/check_and_kick_user.lib.' . C_EXTENSION);
! pmcCheckAndKickUser(true);
  
  
--- 76,91 ----
  /**
   * Gets/Updates the users' informations from/in the connected users table
+  * then close the db link for sessions
   */
  $slashedNick			= pmcSlashSingleQuotes($dbSessionVars['nick']);
  $currentRoomType		= $dbSessionVars['roomType'];
  $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
! if (!dbSessionIsRegistered('noKickTest'))
! {
! 	include('./lib/check_and_kick_user.lib.' . C_EXTENSION);
! 	pmcCheckAndKickUser(true);
! }
! $dbSessionDbLink->close();
! unset($dbSessionDbLink);
  
  
***************
*** 253,256 ****
--- 257,267 ----
  flush();
  ?>
+ 
+ <script type="text/javascript" language="javascript">
+ <!--
+ // Updates the current id
+ window.parent.jsDbSessionSID		= '<?php echo(dbSessionSID('GET')); ?>';
+ // -->
+ </script>
  </body>
  

Index: loader.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/loader.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** loader.php3	2001/04/14 17:51:47	1.10
--- loader.php3	2001/04/18 20:10:55	1.11
***************
*** 70,75 ****
  	dbSessionUpdateLogTime();
  }
- $dbSessionDbLink->close();
- unset($dbSessionDbLink);
  
  /**
--- 70,73 ----
***************
*** 90,99 ****
  /**
   * Gets/Updates the users' informations from/in the connected users table
   */
  $slashedNick			= pmcSlashSingleQuotes($dbSessionVars['nick']);
  $currentRoomType		= $dbSessionVars['roomType'];
  $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
! require('./lib/check_and_kick_user.lib.' . C_EXTENSION);
! pmcCheckAndKickUser(true);
  
  
--- 88,103 ----
  /**
   * Gets/Updates the users' informations from/in the connected users table
+  * then close the db link for sessions
   */
  $slashedNick			= pmcSlashSingleQuotes($dbSessionVars['nick']);
  $currentRoomType		= $dbSessionVars['roomType'];
  $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
! if (!dbSessionIsRegistered('noKickTest'))
! {
! 	include('./lib/check_and_kick_user.lib.' . C_EXTENSION);
! 	pmcCheckAndKickUser(true);
! }
! $dbSessionDbLink->close();
! unset($dbSessionDbLink);
  
  
***************
*** 255,261 ****
--- 259,269 ----
  					 $aMessage .= '<b>>[' . htmlspecialchars($addressee) . ']<bdo dir="' . $textDirection . '"><\/bdo><\/b>&nbsp;';
  				if (strpos($message, 'printf('))
+ 				{
  					eval('$aMessage .= ' . $message . ';');
+ 				}
  				else
+ 				{
  					$aMessage	.= $message;
+ 				}
  			}
  			$aMessage		.= '<\/span>';
***************
*** 297,304 ****
  	location.replace = location.assign;
  
! // Updates the time for last checked user and the last loaded message
  window.parent.jsIsInitLoad			= 0;
  window.parent.jsLastLoadedMsgTime	= <?php echo($lastMsgLoad); ?>;
  window.parent.jsLastCheckedUserTime	= <?php echo($lastUsrCheck); ?>;
  
  <?php
--- 305,314 ----
  	location.replace = location.assign;
  
! // Updates the time for last checked user and the last loaded message, and the
! // current id
  window.parent.jsIsInitLoad			= 0;
  window.parent.jsLastLoadedMsgTime	= <?php echo($lastMsgLoad); ?>;
  window.parent.jsLastCheckedUserTime	= <?php echo($lastUsrCheck); ?>;
+ window.parent.jsDbSessionSID		= '<?php echo(dbSessionSID('GET')); ?>';
  
  <?php

Index: input.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/input.php3,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** input.php3	2001/04/17 19:45:53	1.19
--- input.php3	2001/04/18 20:10:55	1.20
***************
*** 89,94 ****
  $currentRoomType		= $dbSessionVars['roomType'];
  $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
! require('./lib/check_and_kick_user.lib.' . C_EXTENSION);
! pmcCheckAndKickUser(false);
  
  /**
--- 89,101 ----
  $currentRoomType		= $dbSessionVars['roomType'];
  $slashedCurrentRoomName = pmcSlashSingleQuotes($dbSessionVars['currentRoom']);
! if (!dbSessionIsRegistered('noKickTest'))
! {
! 	include('./lib/check_and_kick_user.lib.' . C_EXTENSION);
! 	pmcCheckAndKickUser(false);
! }
! else
! {
! 	dbSessionUnregister('noKickTest');
! }
  
  /**
***************
*** 105,109 ****
  
  // Cookie expires in one year
! setcookie("cookieColor", $color, time() + 60*60*24*365);
  
  
--- 112,116 ----
  
  // Cookie expires in one year
! setcookie('cookieColor', $color, time() + 60*60*24*365);
  
  
***************
*** 289,308 ****
  	<!-- The color picker -->
  	<td>
! 	<table border="0" cellpadding="0" cellspacing="0">
! 		<tr>
! 			<script type="text/javascript" language="javascript1.1">
! 			<!--
! 			// Buffer the color picker
! 			window.parent.jsIsModerator	= <?php echo(($dbSessionVars['status'] == 'a' || $dbSessionVars['status'] == 'm') ? 1 : 0); ?>;
! 			window.parent.pmcSetColorPicker('<?php echo($color); ?>');
! 
! 			// Diplay the color picker
! 			for (k = 0; k < window.parent.jsColorPicker.length; k++)
! 				document.writeln(window.parent.jsColorPicker[k]);
! 			window.parent.jsColorPicker = null;
! 			// -->
! 			</script>
! 		</tr>
! 	</table>
  	</td>
  	<?php
--- 296,311 ----
  	<!-- The color picker -->
  	<td>
! 		<script type="text/javascript" language="javascript1.1">
! 		<!--
! 		// Buffer the color picker
! 		window.parent.jsIsModerator	= <?php echo(($dbSessionVars['status'] == 'a' || $dbSessionVars['status'] == 'm') ? 1 : 0); ?>;
! 		window.parent.pmcSetColorPicker('<?php echo($color); ?>');
! 
! 		// Diplay the color picker
! 		for (k = 0; k < window.parent.jsColorPicker.length; k++)
! 			document.writeln(window.parent.jsColorPicker[k]);
! 		window.parent.jsColorPicker = null;
! 		// -->
! 		</script>
  	</td>
  	<?php

Index: exit.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/exit.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** exit.php3	2001/04/14 17:51:47	1.9
--- exit.php3	2001/04/18 20:10:55	1.10
***************
*** 110,114 ****
  <!-- Display the big + clickable icon used to expand/collapse all rooms -->
  <a href="#" onclick="window.parent.pmcExpandAll(); return false">
! 	<img name="imgExpandAll" src="images/closed_big.gif" width="13" height="13" align="middle" border="0" alt="<?php echo(L_EXPCOL_ALL); ?>" /></a>
  &nbsp;
  	<?php
--- 110,114 ----
  <!-- Display the big + clickable icon used to expand/collapse all rooms -->
  <a href="#" onclick="window.parent.pmcExpandAll(); return false">
! 	<img name="imgExpandAll" id="imgExpandAll" src="images/closed_big.gif" width="13" height="13" align="middle" border="0" alt="<?php echo(L_EXPCOL_ALL); ?>" /></a>
  &nbsp;
  	<?php
***************
*** 131,135 ****
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
  <a href="#" onclick="window.parent.pmcReConnect(); window.parent.pmcSetMsgBoxFocus(); return false">
! 	<img name="imgConState" src="images/connect_off.gif" width="13" height="13" align="middle" border="0" alt="<?php echo(L_CONN_STATE); ?>" /></a>
  	<?php
  }
--- 131,135 ----
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
  <a href="#" onclick="window.parent.pmcReConnect(); window.parent.pmcSetMsgBoxFocus(); return false">
! 	<img name="imgConState" id="imgConState" src="images/connect_off.gif" width="13" height="13" align="middle" border="0" alt="<?php echo(L_CONN_STATE); ?>" /></a>
  	<?php
  }
***************
*** 137,140 ****
--- 137,155 ----
  ?>
  </center>
+ 
+ <?php
+ if ($dbSessionVars['jsVersion'] == 'high')
+ {
+ 	?>
+ <!-- Load the 'loader' frame that will load the 'users' frame! -->
+ <script type="text/javascript" language="javascript">
+ <!--
+ window.parent.pmcReConnect();
+ // -->
+ </script>
+ 	<?php
+ }
+ echo("\n");
+ ?>
  </body>