From 1744f6d07a91514a561b0fc6e34b4d0458ddf072 Mon Sep 17 00:00:00 2001
From: LordGrey <48840279+Lord-Grey@users.noreply.github.com>
Date: Fri, 26 Jun 2020 18:16:59 +0200
Subject: [PATCH] Suppress default password warning (#830)

---
 assets/webconfig/i18n/de.json        |  1 +
 assets/webconfig/i18n/en.json        |  1 +
 assets/webconfig/js/content_index.js | 17 +++++++++++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/assets/webconfig/i18n/de.json b/assets/webconfig/i18n/de.json
index 34218a95..16a8715d 100644
--- a/assets/webconfig/i18n/de.json
+++ b/assets/webconfig/i18n/de.json
@@ -84,6 +84,7 @@
 	"dashboard_message_global_setting": "Die Einstellungen auf dieser Seite sind instanzunabhängig. Änderungen werden global übernommen.",
 	"dashboard_message_default_password_t": "WebUi Standardpasswort gesetzt",
 	"dashboard_message_default_password": "Das Standardpasswort der WebUi ist gesetzt. Wir empfehlen dringend, dieses zu ändern.",
+	"dashboard_message_do_not_show_again": "Diese Meldung nicht mehr anzeigen",
 	"dashboard_active_instance": "Ausgewählte Instanz",
 	"main_menu_dashboard_token": "Dashboard",
 	"main_menu_configuration_token": "Konfiguration",
diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
index 98fd39ff..d37805bd 100644
--- a/assets/webconfig/i18n/en.json
+++ b/assets/webconfig/i18n/en.json
@@ -84,6 +84,7 @@
 	"dashboard_message_global_setting": "The settings on this page are not depending on a specific instance. Changes will be stored globally for all instances.",
 	"dashboard_message_default_password_t": "WebUi default password is set",
 	"dashboard_message_default_password": "The default password for the WebUi is set. We strongly recommend to change this.",
+	"dashboard_message_do_not_show_again": "Do not show this message again",
 	"dashboard_active_instance": "Selected instance",
 	"main_menu_dashboard_token" : "Dashboard",
 	"main_menu_configuration_token" : "Configuration",
diff --git a/assets/webconfig/js/content_index.js b/assets/webconfig/js/content_index.js
index 8d29fa86..219070f7 100644
--- a/assets/webconfig/js/content_index.js
+++ b/assets/webconfig/js/content_index.js
@@ -152,8 +152,13 @@ $(document).ready(function () {
 		$("#main-nav").removeAttr('style')
 		$("#top-navbar").removeAttr('style')
 
-		if (window.defaultPasswordIsSet === true)
-			showNotification('warning', $.i18n('dashboard_message_default_password'), $.i18n('dashboard_message_default_password_t'), '<a style="cursor:pointer" onClick="changePassword()"> ' + $.i18n('InfoDialog_changePassword_title') + '</a>')
+		if (window.defaultPasswordIsSet === true && getStorage("suppressDefaultPwWarning") !== "true" )
+		{
+			var supprPwWarnCheckbox = '<div class="text-right">'+$.i18n('dashboard_message_do_not_show_again')
+					+ ' <input id="chk_suppressDefaultPw" type="checkbox" onChange="suppressDefaultPwWarning()"> </div>'
+			showNotification('warning', $.i18n('dashboard_message_default_password'), $.i18n('dashboard_message_default_password_t'), '<a style="cursor:pointer" onClick="changePassword()">'
+					+ $.i18n('InfoDialog_changePassword_title') + '</a>' + supprPwWarnCheckbox)
+		}
 		else
 			//if logged on and pw != default show option to lock ui
 			$("#btn_lock_ui").removeAttr('style')
@@ -308,6 +313,14 @@ $(document).ready(function () {
 
 });
 
+function suppressDefaultPwWarning(){
+
+  if (document.getElementById('chk_suppressDefaultPw').checked) 
+	setStorage("suppressDefaultPwWarning", "true");
+  else 
+	setStorage("suppressDefaultPwWarning", "false");
+}
+
 $(function () {
 	var sidebar = $('#side-menu');  // cache sidebar to a variable for performance
 	sidebar.delegate('a.inactive', 'click', function () {