Fixed internalization of server messages on the login screen.

This commit is contained in:
Ylian Saint-Hilaire
2019-11-17 14:33:29 -08:00
parent a02ef5259c
commit bcef76863e
9 changed files with 117 additions and 120 deletions

View File

@@ -41,9 +41,7 @@
<div id="loginpanel" style="display:none">
<form method="post">
<input type="hidden" name="action" value="login">
<div id="message1">
{{{message}}}
</div>
<div id="message1"></div>
<div>
<b>Log In</b>
</div>
@@ -74,9 +72,7 @@
<div id="createpanel" style="display:none;position:relative">
<form method="post">
<input type="hidden" name="action" value="createaccount">
<div id="message2">
{{{message}}}
</div>
<div id="message2"></div>
<div>
<b>Account Creation</b>
</div>
@@ -120,9 +116,7 @@
<div id="resetpanel" style="display:none">
<form method="post">
<input type="hidden" name="action" value="resetaccount">
<div id="message3">
{{{message}}}
</div>
<div id="message3"></div>
<div>
<b>Account Reset</b>
</div>
@@ -146,9 +140,7 @@
<form method="post" autocomplete="off">
<input type="hidden" name="action" value="tokenlogin">
<input type="hidden" name="hwstate" value="{{{hwstate}}}">
<div id="message4">
{{{message}}}
</div>
<div id="message4"></div>
<table>
<tbody><tr>
<td align="right" width="100">Login token:</td>
@@ -170,9 +162,7 @@
<div id="resettokenpanel" style="display:none">
<form method="post">
<input type="hidden" name="action" value="resetaccount">
<div id="message5">
{{{message}}}
</div>
<div id="message5"></div>
<table>
<tbody><tr>
<td align="right" width="100">Login token:</td>
@@ -194,9 +184,7 @@
<div id="resetpasswordpanel" style="display:none;position:relative">
<form method="post">
<input type="hidden" name="action" value="resetpassword">
<div id="message6">
{{{message}}}
</div>
<div id="message6"></div>
<div id="rpasswordPolicyCallout" style="display:none"></div>
<table>
<tbody><tr>
@@ -274,6 +262,20 @@
var nightMode = (getstore('_nightMode', '0') == '1');
var publicKeyCredentialRequestOptions = null;
// Display the right server message
var messageid = parseInt('{{{messageid}}}');
var okmessages = ['', "Hold on, reset mail sent."];
var failmessages = ["Unable to create account.", "Account limit reached.", "Existing account with this email address.", "Invalid account creation token.", "Username already exists.", "Password rejected, use a different one.", "Invalid email.", "Account not found.", "Invalid token, try again.", "Unable to sent email.", "Account locked.", "Access denied.", "Login failed, check username and password.", "Password change requested."];
if (messageid > 0) {
var msg = '';
if ((messageid < 100) && (messageid < okmessages.length)) { msg = okmessages[messageid]; }
else if ((messageid >= 100) && ((messageid - 100) < failmessages.length)) { msg = failmessages[messageid - 100]; }
if (msg != '') {
if (messageid >= 100) { msg = ('<span class="msg error"><b style=color:#8C001A>' + msg + '<b></span><br /><br />'); } else { msg = ('<span class="msg success"><b>' + msg + '</b></span><br /><br />'); }
for (var i = 1; i < 7; i++) { QH('message' + i, msg); }
}
}
// If URL arguments are provided, add them to form posts
if (window.location.href.indexOf('?') > 0) {
var urlargs = window.location.href.substring(window.location.href.indexOf('?'));
@@ -351,9 +353,7 @@
QE('tokenOkButton', true);
Q('tokenOkButton').click();
},
function (error) {
console.log('credentials-get error', error);
}
function (error) { console.log('credentials-get error', error); }
);
}
}