wait #6059 @0.25

diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php
index 250354d08f4ee633909e917c214a02b9fa1db15d..20b63e288b0b22bf786c69dd58a44451f62804bc 100644 (file)
--- a/app/Fluidbook/Compiler/Compiler.php
+++ b/app/Fluidbook/Compiler/Compiler.php
@@ -86,6 +86,7 @@ class Compiler extends Base implements CompilerInterface
         ],
         'aria' => ['js/libs/aria/radio.js',],
         'bluebird' => ['js/libs/bluebird.min.js'],
+        'noaccents' => ['js/libs/noaccents.js'],
         'screenfull' => ['js/libs/screenfull.min.js'],
         'storage' => ['js/libs/storage.js',],
         'hotkeys' => ['js/libs/hotkeys.min.js',],

diff --git a/app/Fluidbook/Compiler/Secure.php b/app/Fluidbook/Compiler/Secure.php
index b718bb8b1ac90a10e4d1e82d2d5d1edd30a0d287..4f88caa1a99f984a545e3da75c70b22af66e8edc 100644 (file)
--- a/app/Fluidbook/Compiler/Secure.php
+++ b/app/Fluidbook/Compiler/Secure.php
@@ -31,7 +31,7 @@ trait Secure
             }
             $usersalt = bin2hex(random_bytes(5));
             $user = hash("sha256", $usersalt . '+' . mb_strtolower($e[0]));
-            $users[$user] = ['salt' => $salt, 'usersalt' => $usersalt, 'hash' => hash("sha256", $salt . '-' . $e[1])];
+            $users[$user] = ['salt' => $salt, 'usersalt' => $usersalt, 'hash' => hash("sha256", $salt . '-' . Text::removeAccents($e[1]))];
         }
         return $users;
     }
@@ -83,16 +83,20 @@ trait Secure
         $variables['FORM_USERNAME'] = $locale['Username'] ?? 'Username';
         $variables['FORM_PASSWORD'] = $locale['Password'] ?? 'Password';
         $variables['FORM_SIGN_IN'] = $locale['Sign in'] ?? 'Sign in';
-        $variables['CODE'] = '$(function () {
-            $(\'form\').on(\'submit\', function () {
+        $variables['CODE'] = '
+        $(function(){
+            $(\'form\').on(\'submit\', function (e) {
+                e.preventDefault();
+
                 var u = $("#username").val().toLowerCase();
-                var p = $("#password").val();
+                var p = removeDiacritics($("#password").val());
                 var error = true;
                 $.each(CREDENTIALS, function (user, data) {
                     let hu = forge_sha256(data.usersalt + \'+\' + u);
                     let hp = forge_sha256(data.salt + \'-\' + p);
 
-                    console.log(hu,hp)
+                    console.log(data, hu, hp);
+
                     if (hu === user && hp === data.hash) {
                         error = false;
                         window.sessionStorage.setItem(\'secureUsername\', u);