[phpMyChat CVS] CVS: phpMyChat-0.15/chat/lib format_messages.lib.php3,1.3,1.4

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

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

Modified Files:
	format_messages.lib.php3 
Log Message:
Fix a little bug about latin1 entities transformation

Index: format_messages.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/format_messages.lib.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** format_messages.lib.php3	2001/04/11 23:06:14	1.3
--- format_messages.lib.php3	2001/04/14 15:13:40	1.4
***************
*** 118,133 ****
  	if ($latin1)
  	{
! 		$pattern = '(.*)(' . $GLOBALS['msgTo']. '(>)?)(.*)';
! 		ereg($pattern, $theMessage, $regs);
! 		if ($GLOBALS['msgTo'] != ''
! 			&& ($regs[1] == '' && $regs[4] == ''))
! 		$regs[4] = $theMessage;
  
  		if (!ereg('&[[:alnum:]]{1,10}', $regs[1])
! 			&& !ereg('&[[:alnum:]]{1,10}',$regs[4]))
  		{
! 			for ($i = 1; $i <= 4; $i++)
  			{
! 				if (($i != 1 && $i != 4) || $regs[$i] == '')
  					continue;
  				$part		= $regs[$i];
--- 118,140 ----
  	if ($latin1)
  	{
! 		// Avoid nick transformation
! 		if ($GLOBALS['msgTo'] != '')
! 		{
! 			$pattern = '(.*)(' . $GLOBALS['msgTo']. '(&gt;)?)(.*)';
! 			ereg($pattern, $theMessage, $regs);
! 		}
! 		$regs[1]	= (isset($regs[1])) ? $regs[1] : '';
! 		$regs[2]	= (isset($regs[2])) ? $regs[2] : '';
! 		$regs[4]	= (isset($regs[4])) ? $regs[4] : '';
! 		if ($regs[1] == '' && $regs[4] == '')
! 			$regs[4] = $theMessage;
  
+ 		// Do the work
  		if (!ereg('&[[:alnum:]]{1,10}', $regs[1])
! 			&& !ereg('&[[:alnum:]]{1,10}', $regs[4]))
  		{
! 			for ($i = 1; $i < 5; $i += 3)
  			{
! 				if ($regs[$i] == '')
  					continue;
  				$part		= $regs[$i];