[phpMyChat CVS] CVS: phpMyChat-0.15/chat/localization tutorial.lib.php3,1.8,1.9 languages.lib.php3,1.9,1.10 admin.lib.php3,1.8,1.9

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

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

Modified Files:
	tutorial.lib.php3 languages.lib.php3 admin.lib.php3 
Log Message:
Merged patch #460465 - trim added to language detection func. thanks to Eduardo Cintas

Index: tutorial.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/tutorial.lib.php3,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** tutorial.lib.php3	2001/06/02 06:40:54	1.8
--- tutorial.lib.php3	2001/11/26 22:50:54	1.9
***************
*** 55,60 ****
  		// 				2 for the 'HTTP_USER_AGENT' one
  		if (	($envType == 0 && strcasecmp($name, $str) == 0)
! 			||	($envType == 1 && eregi('^(' . $key . ')(;q=[0-9]\\.[0-9])?$', $str))
! 			||	($envType == 2 && eregi('(\(|\[|;[[:space:]])(' . $key . ')(;|\]|\))', $str)))
  		{
  			$lang		= $availableTutorials[$key];
--- 55,60 ----
  		// 				2 for the 'HTTP_USER_AGENT' one
  		if (	($envType == 0 && strcasecmp($name, $str) == 0)
! 			||	($envType == 1 && eregi('^(' . trim($key) . ')(;q=[0-9]\\.[0-9])?$', $str))
! 			||	($envType == 2 && eregi('(\(|\[|;[[:space:]])(' . trim($key) . ')(;|\]|\))', $str)))
  		{
  			$lang		= $availableTutorials[$key];

Index: languages.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/languages.lib.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** languages.lib.php3	2001/06/02 06:40:54	1.9
--- languages.lib.php3	2001/11/26 22:50:54	1.10
***************
*** 55,60 ****
  		// 				2 for the 'HTTP_USER_AGENT' one
  		if (	($envType == 0 && strcasecmp($name, $str) == 0)
! 			||	($envType == 1 && eregi('^(' . $key . ')(;q=[0-9]\\.[0-9])?$', $str))
! 			||	($envType == 2 && eregi('(\(|\[|;[[:space:]])(' . $key . ')(;|\]|\))', $str)))
  		{
  			$dbSessionVars['lang']	= $availableLanguages[$key];
--- 55,60 ----
  		// 				2 for the 'HTTP_USER_AGENT' one
  		if (	($envType == 0 && strcasecmp($name, $str) == 0)
! 			||	($envType == 1 && eregi('^(' . trim($key) . ')(;q=[0-9]\\.[0-9])?$', $str))
! 			||	($envType == 2 && eregi('(\(|\[|;[[:space:]])(' . trim($key) . ')(;|\]|\))', $str)))
  		{
  			$dbSessionVars['lang']	= $availableLanguages[$key];

Index: admin.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/localization/admin.lib.php3,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** admin.lib.php3	2001/06/02 06:40:54	1.8
--- admin.lib.php3	2001/11/26 22:50:54	1.9
***************
*** 55,60 ****
  		// 				2 for the 'HTTP_USER_AGENT' one
  		if (	($envType == 0 && strcasecmp($name, $str) == 0)
! 			||	($envType == 1 && eregi('^(' . $key . ')(;q=[0-9]\\.[0-9])?$', $str))
! 			||	($envType == 2 && eregi('(\(|\[|;[[:space:]])(' . $key . ')(;|\]|\))', $str)))
  		{
  			$dbSessionVars['adminLang']	= $availableAdmins[$key];
--- 55,60 ----
  		// 				2 for the 'HTTP_USER_AGENT' one
  		if (	($envType == 0 && strcasecmp($name, $str) == 0)
! 			||	($envType == 1 && eregi('^(' . trim($key) . ')(;q=[0-9]\\.[0-9])?$', $str))
! 			||	($envType == 2 && eregi('(\(|\[|;[[:space:]])(' . trim($key) . ')(;|\]|\))', $str)))
  		{
  			$dbSessionVars['adminLang']	= $availableAdmins[$key];