From 5d2e356ea99409b6dd7228ec340884c8ecf0b7a1 Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Wed, 28 May 2025 15:37:57 -0700
Subject: [PATCH] style: enhance form input handling in SMBActiveDirectory.page

- Updated input value handling to use _var() for better security and consistency.
- Refactored submit button logic to improve user experience by enabling/disabling based on AD join status.
- Cleaned up form layout for better readability and maintainability.
---
 .../plugins/dynamix/SMBActiveDirectory.page   | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/emhttp/plugins/dynamix/SMBActiveDirectory.page b/emhttp/plugins/dynamix/SMBActiveDirectory.page
index 8f6d4d164..9e0bc2d30 100644
--- a/emhttp/plugins/dynamix/SMBActiveDirectory.page
+++ b/emhttp/plugins/dynamix/SMBActiveDirectory.page
@@ -15,37 +15,39 @@ Cond="($var['shareSMBEnabled']=='ads')"
  * all copies or substantial portions of the Software.
  */
 ?>
+<?php
+$adJoined = $var['joinStatus'] == "Joined";
+?>
 <form markdown="1" name="JoinOps" method="POST" action="/update.htm" target="progressFrame">
 _(AD join status)_:
 : <?=$var['joinStatus'];?>&nbsp;
 
 _(AD domain name)_ (FQDN):
-: <input type="text" name="DOMAIN" maxlength="80" value="<?=htmlspecialchars($var['DOMAIN'])?>">
+: <input type="text" name="DOMAIN" maxlength="80" value="<?=htmlspecialchars(_var($var['DOMAIN']))?>">
 
 _(AD short domain name)_:
-: <input type="text" name="DOMAIN_SHORT" maxlength="40" value="<?=htmlspecialchars($var['DOMAIN_SHORT'])?>">
+: <input type="text" name="DOMAIN_SHORT" maxlength="40" value="<?=htmlspecialchars(_var($var['DOMAIN_SHORT']))?>">
 
 _(AD account login)_:
-: <input type="text" name="DOMAIN_LOGIN" maxlength="40" value="<?=htmlspecialchars($var['DOMAIN_LOGIN'])?>">
+: <input type="text" name="DOMAIN_LOGIN" maxlength="40" value="<?=htmlspecialchars(_var($var['DOMAIN_LOGIN']))?>">
 
 _(AD account password)_:
-: <input type="password" name="DOMAIN_PASSWD" maxlength="40" value="<?=htmlspecialchars($var['DOMAIN_PASSWD'])?>">
+: <input type="password" name="DOMAIN_PASSWD" maxlength="40" value="<?=htmlspecialchars(_var($var['DOMAIN_PASSWD']))?>">
 
 &nbsp;
-: <?if ($var['joinStatus']=="Joined"):?>
-  <input type="submit" name="cmdJoinDomain" value="_(Join)_" disabled><input type="submit" name="cmdLeaveDomain" value="_(Leave)_">
-  <?else:?>
-  <input type="submit" name="cmdJoinDomain" value="_(Join)_"><input type="submit" name="cmdLeaveDomain" value="_(Leave)_" disabled>
-  <?endif;?>
+: <span class="inline-block">
+    <input type="submit" name="cmdJoinDomain" value="_(Join)_" <?=$adJoined ? "disabled" : "";?>>
+    <input type="submit" name="cmdLeaveDomain" value="_(Leave)_" <?=$adJoined ? "" : "disabled";?>>
+  </span>
 </form>
-<br>
+
 
 <form markdown="1" name="shareOwnership" method="POST" action="/update.htm" target="progressFrame">
 _(AD initial owner)_:
-: <input type="text" name="shareInitialOwner" maxlength="40" value="<?=htmlspecialchars($var['shareInitialOwner'])?>">
+: <input type="text" name="shareInitialOwner" maxlength="40" value="<?=htmlspecialchars(_var($var['shareInitialOwner']))?>">
 
 _(AD initial group)_:
-: <input type="text" name="shareInitialGroup" maxlength="40" value="<?=htmlspecialchars($var['shareInitialGroup'])?>">
+: <input type="text" name="shareInitialGroup" maxlength="40" value="<?=htmlspecialchars(_var($var['shareInitialGroup']))?>">
 
 &nbsp;
 : <span class="inline-block">