Handling usernames.

Usernames should be handled more properly.
FOGProject · Jan 9, 2017 · 862e48f · 862e48f
1 parent 5a7683d
commit 862e48f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '7');
+        define('FOG_VERSION', '8');
         define('FOG_SCHEMA', 245);
         define('FOG_BCACHE_VER', 111);
         define('FOG_SVN_REVISION', 6052);

diff --git a/packages/web/lib/fog/user.class.php b/packages/web/lib/fog/user.class.php
@@ -128,7 +128,7 @@ public function passwordValidate(
          * immediately if found.
          */
         $test = preg_match(
-            '^\w(?:\w*(?:[.-]\w+)?)*(?<=^.{3,40})$',
+            '/(?=^.{3,40}$)^[\w][\w0-9]*[._@-]?[\w0-9]*[.]?[\w0-9]+$/i',
             $username
         );
         if (!$test) {
@@ -183,7 +183,7 @@ public function validatePw(
          * immediately if found.
          */
         $test = preg_match(
-            '^\w(?:\w*(?:[.-]\w+)?)*(?<=^.{3,40})$',
+            '/(?=^.{3,40}$)^[\w][\w0-9]*[._@-]?[\w0-9]*[.]?[\w0-9]+$/i',
             $username
         );
         if (!$test) {

diff --git a/packages/web/lib/plugins/ldap/class/ldap.class.php b/packages/web/lib/plugins/ldap/class/ldap.class.php
@@ -245,7 +245,7 @@ public function authLDAP($user, $pass)
          * immediately if found.
          */
         $test = preg_match(
-            '^\w(?:\w*(?:[.-]\w+)?)*(?<=^.{3,40})$',
+            '/(?=^.{3,40}$)^[\w][\w0-9]*[._@-]?[\w0-9]*[.]?[\w0-9]+$/i',
             $user
         );
         if (!$test) {

diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-09 14:44-0500\n"
+"POT-Creation-Date: 2017-01-09 15:10-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"