From 14e3d04e25eceb52baafa43202f69759bf08717e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 Jun 2021 13:02:17 +0200
Subject: [PATCH] Add more info on security page

---
 htdocs/admin/system/security.php | 14 ++++++++++++++
 htdocs/langs/en_US/admin.lang    |  6 ++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 5214808985d..b076cd020be 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -245,8 +245,22 @@ if (empty($dolibarr_main_restrict_ip)) {
 	print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 	//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
 }
+
 print '<br>';
 
+if (empty($conf->global->SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF)) {
+	print '<strong>$dolibarr_main_db_pass</strong>: ';
+	if (!empty($dolibarr_main_db_pass) && !preg_match('/^crypted:/', $dolibarr_main_db_pass)) {
+		print img_picto('', 'warning').' '.$langs->trans("DatabasePasswordNotObfuscated").' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommanded").': '.$langs->trans("SetOptionTo", $langs->transnoentitiesnoconv("MainDbPasswordFileConfEncrypted"), yn(1)).')</span>';
+		//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
+	} else {
+		print img_picto('', 'tick').' '.$langs->trans("");
+	}
+
+	print '<br>';
+}
+
+
 
 // Menu security
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b7618f64739..5ae901dc7b2 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -221,8 +221,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=See setup of module %s
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
-Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -2141,4 +2141,6 @@ ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
-RandomlySelectedIfSeveral=Randomly selected if several pictures are available
\ No newline at end of file
+RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+DatabasePasswordObfuscated=Database password obfucated in conf file
+DatabasePasswordNotObfuscated=Database password obfucated in conf file