Update of /cvsroot/phpmychat/phpMyChat - 0.14/chat/localization
In directory usw-pr-cvs1:/tmp/cvs-serv31473/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
***** Bogus filespec: -
***** Bogus filespec: 0.14/chat/localization
Index: tutorial.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat - 0.14/chat/localization/tutorial.lib.php3,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** tutorial.lib.php3 2001/05/31 18:06:30 1.4
--- tutorial.lib.php3 2001/11/26 22:48:14 1.5
***************
*** 26,30 ****
while($NotFound && list($key, $name) = each($AvailableTutorials))
{
! if (($From == 1 && eregi("^(".$key.")$",$Str)) || ($From == 2 && eregi("(\(|\[|;[[:space:]])(".$key.")(;|\]|\))",$Str)))
{
$L = $AvailableTutorials[$key];
--- 26,30 ----
while($NotFound && list($key, $name) = each($AvailableTutorials))
{
! if (($From == 1 && eregi("^(".trim($key).")$",$Str)) || ($From == 2 && eregi("(\(|\[|;[[:space:]])(".trim($key).")(;|\]|\))",$Str)))
{
$L = $AvailableTutorials[$key];
Index: languages.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat - 0.14/chat/localization/languages.lib.php3,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** languages.lib.php3 2001/05/31 18:06:30 1.4
--- languages.lib.php3 2001/11/26 22:48:14 1.5
***************
*** 29,33 ****
while($NotFound && list($key, $name) = each($AvailableLanguages))
{
! if (($From == 1 && eregi("^(".$key.")$",$Str)) || ($From == 2 && eregi("(\(|\[|;[[:space:]])(".$key.")(;|\]|\))",$Str)))
{
$L = $AvailableLanguages[$key];
--- 29,33 ----
while($NotFound && list($key, $name) = each($AvailableLanguages))
{
! if (($From == 1 && eregi("^(".trim($key).")$",$Str)) || ($From == 2 && eregi("(\(|\[|;[[:space:]])(".trim($key).")(;|\]|\))",$Str)))
{
$L = $AvailableLanguages[$key];
Index: admin.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat - 0.14/chat/localization/admin.lib.php3,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** admin.lib.php3 2001/05/31 18:06:30 1.4
--- admin.lib.php3 2001/11/26 22:48:14 1.5
***************
*** 26,30 ****
while($NotFound && list($key, $name) = each($AvailableAdmin))
{
! if (($From == 1 && eregi("^(".$key.")$",$Str)) || ($From == 2 && eregi("(\(|\[|;[[:space:]])(".$key.")(;|\]|\))",$Str)))
{
$L = $AvailableAdmin[$key];
--- 26,30 ----
while($NotFound && list($key, $name) = each($AvailableAdmin))
{
! if (($From == 1 && eregi("^(".trim($key).")$",$Str)) || ($From == 2 && eregi("(\(|\[|;[[:space:]])(".trim($key).")(;|\]|\))",$Str)))
{
$L = $AvailableAdmin[$key];
|
