In config.php3 remove whitespaces from $login. Don't remove '-'

diff --git a/Changelog b/Changelog
index bb5842157db289e965d6f949cec4e4dbdc13c549..92b790355324d1170271247cb5d03bc216717402 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -27,6 +27,7 @@ Ver 1.75:
 * Fix a small typo in the userinfo mysql schema. Found by Evert Meulie
 * Fix bug #136, bugs found by Pawel Foremski
 * Small type in login_time_create, close bug #141
+* In config.php3 remove whitespaces from $login. Don't remove '-'
 Ver 1.72:
 * Move the xlat function to a separate file in lib/xlat.php3
 * Add a lib/sql/nas_list.php3 to also get the nas list from sql (naslist.conf still works)

diff --git a/conf/config.php3 b/conf/config.php3
index adc99ae1f1d22ea2b2d0d2dea0be0ad7289ea036..2b0a2c817489e501023c192e4d1f9bc26fa1cc46 100644 (file)
--- a/conf/config.php3
+++ b/conf/config.php3
@@ -71,7 +71,7 @@ if ($use_session == 0 && $config[general_use_session] == 'yes'){
 }
 //Make sure we are only passed allowed strings in username
 if ($login != '')
-       $login = preg_replace("/[^\w\s\.\/\@\:]/",'',$login);
+       $login = preg_replace("/[^\w\.\/\@\:\-]/",'',$login);
 
 if ($login != '' && $config[general_strip_realms] == 'yes'){
        $realm_del = ($config[general_realm_delimiter] != '') ? $config[general_realm_delimiter] : '@';