wip #6899 @1

diff --git a/js/libs/fluidbook/fluidbook.secure.js b/js/libs/fluidbook/fluidbook.secure.js
index a7a44bee6466766d2c7e48a06c155987f0720253..bbb72e989533ca0697af046b346f1ba43a4bf7db 100644 (file)
--- a/js/libs/fluidbook/fluidbook.secure.js
+++ b/js/libs/fluidbook/fluidbook.secure.js
@@ -3,6 +3,7 @@ __('Username')
 __('Password')
 __('Sign in')
 __('Wrong username or password')
+__('User unknown')
  */
 function FluidbookSecure(fluidbook) {
     this.fluidbook = fluidbook;
@@ -131,14 +132,26 @@ FluidbookSecure.prototype = {
         if (u !== null) {
             u = u.toLowerCase();
         }
-        var p = window.sessionStorage.getItem('securePassword');
         var ok = false;
-        if (u !== null && p !== null) {
-            $.each(this.fluidbook.settings.secureClientSidePasswordCredentials, function (user, data) {
-                if (forge_sha256(data.usersalt + '+' + u) === user && forge_sha256(data.salt + '-' + p) === data.hash) {
-                    ok = true;
-                }
-            });
+        if (this.fluidbook.settings.secureClientSideMode == '1') {
+            if (u !== null) {
+                $.each(this.fluidbook.settings.secureClientSidePasswordCredentials, function (user, data) {
+                    if (forge_sha256(data.usersalt + '+' + u) === user) {
+                        ok = true;
+                        return false;
+                    }
+                });
+            }
+        } else {
+            var p = window.sessionStorage.getItem('securePassword');
+            if (u !== null && p !== null) {
+                $.each(this.fluidbook.settings.secureClientSidePasswordCredentials, function (user, data) {
+                    if (forge_sha256(data.usersalt + '+' + u) === user && forge_sha256(data.salt + '-' + p) === data.hash) {
+                        ok = true;
+                        return false;
+                    }
+                });
+            }
         }
 
         if (!ok) {