From 70d9eee2c5723a0acf141511784e3228f9867354 Mon Sep 17 00:00:00 2001
From: David Coutadeur <david.coutadeur@worteks.com>
Date: Wed, 27 Nov 2024 10:09:53 +0100
Subject: [PATCH 1/2] fix disable account msg in comment (#187)

---
 templates/display.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/display.tpl b/templates/display.tpl
index a8495be..5980a39 100644
--- a/templates/display.tpl
+++ b/templates/display.tpl
@@ -331,7 +331,7 @@
                         <i class="fa fa-fw fa-info-circle text-body-tertiary ms-2" title="{$msg_comment_needed}"></i>
                     </button>
                     <div>
-                        {include 'comment.tpl' method=disable page=disableaccount title=$msg_lockaccount}
+                        {include 'comment.tpl' method=disable page=disableaccount title=$msg_disableaccount}
                     </div>
                 {else}
                     <form id="disableaccount" method="post" action="index.php?page=disableaccount">

From 06bcaad87172844bd1a7463ce0ab999a626806e0 Mon Sep 17 00:00:00 2001
From: David Coutadeur <david.coutadeur@worteks.com>
Date: Wed, 27 Nov 2024 10:47:30 +0100
Subject: [PATCH 2/2] fix error not displayed while
 enabling/disabling/locking/unlocking account (#187)

---
 htdocs/display.php | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/htdocs/display.php b/htdocs/display.php
index 85cdc44..4b05551 100644
--- a/htdocs/display.php
+++ b/htdocs/display.php
@@ -9,8 +9,10 @@
 $edit_link = "";
 $checkpasswordresult= "";
 $resetpasswordresult= "";
-$accountunlockresult= "";
-$accountlockresult= "";
+$unlockaccountresult= "";
+$lockaccountresult= "";
+$enableaccountresult= "";
+$disableaccountresult= "";
 $prehookresult= "";
 $posthookresult= "";
 $ldapExpirationDate="";
@@ -34,12 +36,20 @@
     $resetpasswordresult = $_GET["resetpasswordresult"];
 }
 
-if (isset($_GET["accountunlockresult"]) and $_GET["accountunlockresult"]) {
-    $accountunlockresult = $_GET["accountunlockresult"];
+if (isset($_GET["unlockaccountresult"]) and $_GET["unlockaccountresult"]) {
+    $unlockaccountresult = $_GET["unlockaccountresult"];
 }
 
-if (isset($_GET["accountlockresult"]) and $_GET["accountlockresult"]) {
-    $accountlockresult = $_GET["accountlockresult"];
+if (isset($_GET["lockaccountresult"]) and $_GET["lockaccountresult"]) {
+    $lockaccountresult = $_GET["lockaccountresult"];
+}
+
+if (isset($_GET["enableaccountresult"]) and $_GET["enableaccountresult"]) {
+    $enableaccountresult = $_GET["enableaccountresult"];
+}
+
+if (isset($_GET["disableaccountresult"]) and $_GET["disableaccountresult"]) {
+    $disableaccountresult = $_GET["disableaccountresult"];
 }
 
 if (isset($_GET["prehookresult"]) and $_GET["prehookresult"]) {
@@ -183,8 +193,10 @@
 
 $smarty->assign("checkpasswordresult", $checkpasswordresult);
 $smarty->assign("resetpasswordresult", $resetpasswordresult);
-$smarty->assign("accountunlockresult", $accountunlockresult);
-$smarty->assign("accountlockresult", $accountlockresult);
+$smarty->assign("unlockaccountresult", $unlockaccountresult);
+$smarty->assign("lockaccountresult", $lockaccountresult);
+$smarty->assign("enableaccountresult", $enableaccountresult);
+$smarty->assign("disableaccountresult", $disableaccountresult);
 $smarty->assign("prehookresult", $prehookresult);
 $smarty->assign("posthookresult", $posthookresult);
 if ($canLockAccount == false) { $smarty->assign("use_lockaccount", $canLockAccount); }