Merge branch 'master' into 172-possibility-to-edit-accountpassword-va…

…lidity-dates
ltb-project · Nov 27, 2024 · 5faacfd · 5faacfd
2 parents 8bbee32 + 06bcaad
commit 5faacfd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git 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="";
@@ -37,12 +39,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"]) {
@@ -198,8 +208,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); }

diff --git 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">