From 862e48fd246fa07b71690481e94fc7cb808c488a Mon Sep 17 00:00:00 2001
From: Tom Elliott <tommygunsster@gmail.com>
Date: Mon, 9 Jan 2017 15:10:40 -0500
Subject: [PATCH] Handling usernames.

Usernames should be handled more properly.
---
 packages/web/lib/fog/system.class.php              | 2 +-
 packages/web/lib/fog/user.class.php                | 4 ++--
 packages/web/lib/plugins/ldap/class/ldap.class.php | 2 +-
 packages/web/management/languages/messages.pot     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
index 0ad29c1d08..2cf784eceb 100644
--- 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
index f8ca5c5d9e..513a1340ed 100644
--- 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
index ca697b93cf..3cc252661f 100644
--- 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
index b3710b93d7..2c96c70521 100644
--- 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"