From ab7ee56470da9302665b7e39298dcd9f89374668 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Sat, 4 May 2019 13:20:25 -0700 Subject: [PATCH] Fixed password change dialog box. --- package.json | 3 +-- views/default-min.handlebars | 2 +- views/default-mobile-min.handlebars | 2 +- views/default-mobile.handlebars | 16 +++++++++------- views/default.handlebars | 8 +++++--- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 86a4ce43..0d3a9c13 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.3.3-s", + "version": "0.3.3-t", "keywords": [ "Remote Management", "Intel AMT", @@ -36,7 +36,6 @@ "express-handlebars": "^3.0.0", "express-ws": "^4.0.0", "ipcheck": "^0.1.0", - "ldapauth-fork": "^4.2.0", "meshcentral": "*", "minimist": "^1.2.0", "multiparty": "^4.2.1", diff --git a/views/default-min.handlebars b/views/default-min.handlebars index 5a753398..12ca9e14 100644 --- a/views/default-min.handlebars +++ b/views/default-min.handlebars @@ -1 +1 @@ - {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

\ No newline at end of file + {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

\ No newline at end of file diff --git a/views/default-mobile-min.handlebars b/views/default-mobile-min.handlebars index ff51f754..bb1b2103 100644 --- a/views/default-mobile-min.handlebars +++ b/views/default-mobile-min.handlebars @@ -1 +1 @@ - {{{title}}}
{{{title}}}
{{{title2}}}
\ No newline at end of file + {{{title}}}
{{{title}}}
{{{title2}}}
\ No newline at end of file diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars index 42e2e079..9c5dbe7c 100644 --- a/views/default-mobile.handlebars +++ b/views/default-mobile.handlebars @@ -1153,17 +1153,18 @@ function account_showChangePassword() { if (xxdialogMode) return; - var x = "
"; - x += ""; - x += ""; - if (features & 0x00010000) { x += ""; } - x += '
Password:
Password:
Hint:
'; + var x = ""; + x += ""; + x += ""; + x += ""; + if (features & 0x00010000) { x += ""; } + x += '
Old Password:
New Password:
New Password:
Hint:
'; x += ''; x += ''; x += '

'; setDialogMode(2, "Change Password", 0, null, x); account_validateNewPassword(); - Q('apassword1').focus(); + Q('apassword0').focus(); } function account_createMesh() { @@ -1200,7 +1201,8 @@ } function account_validateNewPassword() { - var r = '', ok = (Q('apassword1').value.length > 0) && (Q('apassword1').value == Q('apassword2').value); + var r = '', ok = (Q('apassword0').value.length > 0) && (Q('apassword1').value.length > 0) && (Q('apassword1').value == Q('apassword2').value) && (Q('apassword0').value != Q('apassword1').value); + if ((features & 0x00010000) && (Q('apasswordhint').value == Q('apassword1').value)) { ok = false; } if (Q('apassword1').value != '') { if (passRequirements == null || passRequirements == '') { // No password requirements, display password strength diff --git a/views/default.handlebars b/views/default.handlebars index 2c33a05c..9f32de2e 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -1253,7 +1253,6 @@ function addLetterS(x) { return (x > 1) ? 's' : ''; } function onMessage(server, message) { - console.log(message); switch (message.action) { case 'serverstats': { updateGeneralServerStats(message); @@ -5837,7 +5836,9 @@ function account_showChangePassword() { if (xxdialogMode) return; - var x = "Change your account password by entering the old password and new password twice in the boxes below. Password hint can be used but is not recommanded.

"; + var x = "Change your account password by entering the old password and new password twice in the boxes below."; + if (features & 0x00010000) { " Password hint can be used but is not recommanded."; } + x += "

";; //x += "
"; x += ""; x += ""; @@ -5903,7 +5904,8 @@ } function account_validateNewPassword() { - var r = '', ok = (Q('apassword0').value.length > 0) && (Q('apassword1').value.length > 0) && (Q('apassword1').value == Q('apassword2').value) && (Q('apassword0').value != Q('apassword1').value) && (Q('apasswordhint').value != Q('apassword1').value); + var r = '', ok = (Q('apassword0').value.length > 0) && (Q('apassword1').value.length > 0) && (Q('apassword1').value == Q('apassword2').value) && (Q('apassword0').value != Q('apassword1').value); + if ((features & 0x00010000) && (Q('apasswordhint').value == Q('apassword1').value)) { ok = false; } if (Q('apassword1').value != '') { if (passRequirements == null || passRequirements == '') { // No password requirements, display password strength
Old password: