Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop

apps/maarch_entreprise/log.php

@@ -178,6 +178,7 @@ if (!empty($_SESSION['error'])) {
             } catch (Exception $conFailure) {
                 if (!empty($standardConnect) && $standardConnect == 'true') {
                     $res = $sec->login($login, $password, 'ldap', $standardConnect);
+                    $login = $res['user']['UserId'];
                     $_SESSION['user'] = $res['user'];
                     if (empty($res['error'])) {
                         \SrcCore\models\AuthenticationModel::setCookieAuth(['userId' => $login]);
@@ -283,6 +284,7 @@ if (!empty($_SESSION['error'])) {
         $_SESSION['error'] = '';
         $res = $sec->login($login, $password);
         $_SESSION['user'] = $res['user'];
+        $login = $res['user']['UserId'];
         if (empty($res['error'])) {
             \SrcCore\models\AuthenticationModel::setCookieAuth(['userId' => $login]);
             \SrcCore\models\AuthenticationModel::resetFailedAuthentication(['userId' => $login]);

src/core/models/AuthenticationModel.php

@@ -29,7 +29,7 @@ class AuthenticationModel
         $aReturn = DatabaseModel::select([
             'select'    => ['password'],
             'table'     => ['users'],
-            'where'     => ['user_id = ?', 'status != ?', '(locked_until is null OR locked_until < CURRENT_TIMESTAMP)'],
+            'where'     => ['lower(user_id) = lower(?)', 'status != ?', '(locked_until is null OR locked_until < CURRENT_TIMESTAMP)'],
             'data'      => [$args['userId'], 'DEL']
         ]);