From 6a61320ea0b6a96bb33cc7e1049b7ca5fb7a3614 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Fri, 17 Oct 2025 10:28:16 -0700
Subject: [PATCH] Add contextual bridged interface settings

---
 app/js/ui/main.js              | 32 +++++++++++++++++++++++
 templates/hostapd/advanced.php | 48 ++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/app/js/ui/main.js b/app/js/ui/main.js
index 008765c6..dc623236 100644
--- a/app/js/ui/main.js
+++ b/app/js/ui/main.js
@@ -78,6 +78,38 @@ $(document).on("submit", ".js-dhcp-settings-form", function(e) {
     $(".js-add-dhcp-upstream-server").trigger("click");
 });
 
+document.addEventListener('DOMContentLoaded', function() {
+  const bridgeCheckbox = document.getElementById('chxbridgedenable');
+  const bridgeSection = document.getElementById('bridgeStaticIpSection');
+  const staticIpInput = document.getElementById('bridgeStaticIp');
+  const previewIp = document.getElementById('previewStaticIp');
+  
+  // toggle visibility
+  bridgeCheckbox.addEventListener('change', function() {
+    bridgeSection.style.display = this.checked ? 'block' : 'none';
+  });
+  
+  staticIpInput.addEventListener('input', function() {
+    previewIp.textContent = this.value || 'your-static-ip';
+  });
+  
+  const form = bridgeCheckbox.closest('form');
+  if (form) {
+    form.addEventListener('submit', function(e) {
+      if (bridgeCheckbox.checked) {
+        const staticIp = staticIpInput.value.trim();
+        const gateway = document.getElementById('bridgeGateway').value.trim();
+        
+        if (staticIp && !gateway) {
+          e.preventDefault();
+          // raise alert
+          return false;
+        }
+      }
+    });
+  }
+});
+
 /**
  * mark a form field, e.g. a select box, with the class `.js-field-preset`
  * and give it an attribute `data-field-preset-target` with a text field's
diff --git a/templates/hostapd/advanced.php b/templates/hostapd/advanced.php
index 1476d5d4..fa46009f 100644
--- a/templates/hostapd/advanced.php
+++ b/templates/hostapd/advanced.php
@@ -10,6 +10,54 @@
         </div>
       </div>
     </div>
+
+    <div class="row" id="bridgeStaticIpSection" style="display: <?php echo $arrHostapdConf['BridgedEnable'] == 1 ? 'block' : 'none' ?>;">
+      <div class="col-md-12 mb-3">
+        <div class="card">
+          <div class="card-body">
+            <h6 class="card-title"><?php echo _("Bridge network settings"); ?></h6>
+            <p class="text-muted small mb-3">
+              <?php echo _("Configure a static IP address for the <code>br0</code> interface to maintain connectivity during bridged mode. Leave blank to use DHCP (not recommended)."); ?>
+            </p>
+            
+            <div class="row g-3">
+              <div class="col-md-6">
+                <label for="bridgeStaticIp" class="form-label"><?php echo _("Static IP Address"); ?></label>
+                <input type="text" class="form-control ip_address" id="bridgeStaticIp" name="bridgeStaticIp" 
+                       value="<?php echo htmlspecialchars($arrHostapdConf['BridgeStaticIP'] ?? '', ENT_QUOTES); ?>" 
+                       placeholder="192.168.1.100" />
+                <div class="form-text"><?php echo _("Example: 192.168.1.100"); ?></div>
+              </div>
+              
+              <div class="col-md-6">
+                <label for="bridgeNetmask" class="form-label"><?php echo _("Netmask / CIDR"); ?></label>
+                <input type="text" class="form-control" id="bridgeNetmask" name="bridgeNetmask" 
+                       value="<?php echo htmlspecialchars($arrHostapdConf['BridgeNetmask'] ?? '24', ENT_QUOTES); ?>" 
+                       placeholder="24" />
+                <div class="form-text"><?php echo _("CIDR notation (e.g., 24 for 255.255.255.0)"); ?></div>
+              </div>
+              
+              <div class="col-md-6">
+                <label for="bridgeGateway" class="form-label"><?php echo _("Gateway"); ?></label>
+                <input type="text" class="form-control ip_address" id="bridgeGateway" name="bridgeGateway" 
+                       value="<?php echo htmlspecialchars($arrHostapdConf['BridgeGateway'] ?? '', ENT_QUOTES); ?>" 
+                       placeholder="192.168.1.1" />
+                <div class="form-text"><?php echo _("Your router's IP address"); ?></div>
+              </div>
+              
+              <div class="col-md-6">
+                <label for="bridgeDNS" class="form-label"><?php echo _("DNS Server"); ?></label>
+                <input type="text" class="form-control ip_address" id="bridgeDNS" name="bridgeDNS" 
+                       value="<?php echo htmlspecialchars($arrHostapdConf['BridgeDNS'] ?? '', ENT_QUOTES); ?>" 
+                       placeholder="192.168.1.1" />
+                <div class="form-text"><?php echo _("Usually same as gateway"); ?></div>
+              </div>
+            </div>
+              </div>
+        </div>
+      </div>
+    </div>
+
     <div class="row">
       <div class="col-md-6 mb-2">
         <div class="form-check form-switch">