-
{{{title}}} {{{title2}}} {{{logoutControl}}} ↔
{{{title}}} {{{title2}}} {{{logoutControl}}} ↔
| ||||||||||||||||||||||||||||||||||||||||||||||||||||||
New
Requirements: ' + r.join(', ') + '.'; } + if (passRequirements) { + var r = [], rc = 0; + for (var i in passRequirements) { if ((i != 'reset') && (i != 'hint')) { r.push(i + ':' + passRequirements[i]); rc++; } } + if (rc > 0) { x += '
Requirements: ' + r.join(', ') + '.'; } + } x += '
'; //x += '
';
//x += '';
@@ -5608,7 +5612,9 @@
function account_showChangePasswordEx() {
if (Q('apassword1').value == Q('apassword2').value) {
- meshserver.send({ action: 'changepassword', oldpass: Q('apassword0').value, newpass: Q('apassword1').value, hint: Q('apasswordhint').value });
+ var r = { action: 'changepassword', oldpass: Q('apassword0').value, newpass: Q('apassword1').value };
+ if (features & 0x00010000) { r.hint = Q('apasswordhint').value; }
+ meshserver.send(r);
}
}
@@ -6487,7 +6493,14 @@
x += addHtmlValue('Email', '');
x += addHtmlValue('Password', '');
x += addHtmlValue('Password', '');
- if (passRequirements) { var r = []; for (var i in passRequirements) { r.push(i + ':' + passRequirements[i]); } x += 'MeshCentral - Login
\ No newline at end of file
+ MeshCentral - Login
\ No newline at end of file
diff --git a/views/login-mobile-min.handlebars b/views/login-mobile-min.handlebars
index 7bd32300..687c7d69 100644
--- a/views/login-mobile-min.handlebars
+++ b/views/login-mobile-min.handlebars
@@ -1 +1 @@
- MeshCentral - Login
\ No newline at end of file
+ MeshCentral - Login
\ No newline at end of file
diff --git a/views/login-mobile.handlebars b/views/login-mobile.handlebars
index f678b25e..54815892 100644
--- a/views/login-mobile.handlebars
+++ b/views/login-mobile.handlebars
@@ -100,7 +100,7 @@
Password:
Requirements: ' + r.join(', ') + '.
'; }
+ x += 'Force password reset on next login.
';
+
+ if (passRequirements) {
+ var r = [], rc = 0;
+ for (var i in passRequirements) { if ((i != 'reset') && (i != 'hint')) { r.push(i + ':' + passRequirements[i]); rc++; } }
+ if (rc > 0) { x += 'Requirements: ' + r.join(', ') + '.
'; }
+ }
+
setDialogMode(2, "Create Account", 3, showCreateNewAccountDialogEx, x);
showCreateNewAccountDialogValidate();
Q('p4name').focus();
@@ -6501,7 +6514,7 @@
}
function showCreateNewAccountDialogEx() {
- meshserver.send({ action: 'adduser', username: Q('p4name').value, email: Q('p4email').value, pass: Q('p4pass1').value });
+ meshserver.send({ action: 'adduser', username: Q('p4name').value, email: Q('p4email').value, pass: Q('p4pass1').value, resetNextLogin: Q('p4resetNextLogin').checked });
}
function showUserAdminDialog(e, userid) {
@@ -6689,8 +6702,14 @@
var x = '';
x += addHtmlValue('Password', '');
x += addHtmlValue('Password', '');
- x += addHtmlValue('Password hint', '');
- if (passRequirements) { var r = []; for (var i in passRequirements) { r.push(i + ':' + passRequirements[i]); } x += 'Requirements: ' + r.join(', ') + '.
'; }
+ if (features & 0x00010000) { x += addHtmlValue('Password hint', ''); }
+
+ if (passRequirements) {
+ var r = [], rc = 0;
+ for (var i in passRequirements) { if ((i != 'reset') && (i != 'hint')) { r.push(i + ':' + passRequirements[i]); rc++; } }
+ if (rc > 0) { x += 'Requirements: ' + r.join(', ') + '.
'; }
+ }
+
x += 'Force password reset on next login.
';
if (multiFactor == 1) { x += 'Remove all 2nd factor authentication.
'; }
setDialogMode(2, "Change Password for " + EscapeHtml(currentUser.name), 3, p30showUserChangePassDialogEx, x, multiFactor);
@@ -6701,7 +6720,11 @@
function p30showUserChangePassDialogEx(b, tag) {
var removeMultiFactor = false;
if ((tag == 1) && (Q('p4twoFactorRemove').checked == true)) { removeMultiFactor = true; }
- if (Q('p4pass1').value == Q('p4pass2').value) { meshserver.send({ action: 'changeuserpass', user: currentUser.name, pass: Q('p4pass1').value, hint: Q('p4hint').value, removeMultiFactor: removeMultiFactor, resetNextLogin: Q('p4resetNextLogin').checked }); }
+ if (Q('p4pass1').value == Q('p4pass2').value) {
+ var r = { action: 'changeuserpass', user: currentUser.name, pass: Q('p4pass1').value, removeMultiFactor: removeMultiFactor, resetNextLogin: Q('p4resetNextLogin').checked };
+ if (features & 0x00010000) { r.hint = Q('p4hint').value; }
+ meshserver.send(r);
+ }
}
function p30showDeleteUserDialog() {
diff --git a/views/login-min.handlebars b/views/login-min.handlebars
index 7de9e556..f2dee8d2 100644
--- a/views/login-min.handlebars
+++ b/views/login-min.handlebars
@@ -1 +1 @@
- {{{title}}}
{{{title2}}}
↔
Welcome
 |
{{{title}}}
{{{title2}}}
↔
Welcome
| |
{{{title}}}
{{{title2}}}
{{{title}}}
{{{title2}}}