From 17da7cfcab0c6130a6a5ebe744107683b8d39623 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Sun, 15 Nov 2020 10:51:51 +0000
Subject: [PATCH] Move enable DHCP option to general tab

---
 templates/dhcp/advanced.php | 13 -------------
 templates/dhcp/general.php  | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/templates/dhcp/advanced.php b/templates/dhcp/advanced.php
index bd158f27..fda2eb00 100644
--- a/templates/dhcp/advanced.php
+++ b/templates/dhcp/advanced.php
@@ -47,19 +47,6 @@
           <?php echo optionsForSelect(dnsServers()) ?>
         </select>
       </div>
-
-      <h5><?php echo _("DHCP for eth0") ?></h5>
-      <div class="input-group">
-        <input type="hidden" name="dchp-eth0" value="0">
-        <div class="custom-control custom-switch">
-          <input class="custom-control-input" id="dhcp-eth0" type="checkbox" name="dhcp-eth0" value="1" <?php echo $dhcp_eth0 ? ' checked="checked"' : "" ?> aria-describedby="dhcp-eth0-description">
-          <label class="custom-control-label" for="dhcp-eth0"><?php echo _("Enable DHCP for wired ethernet") ?></label>
-        </div>
-        <p id="dhcp-eth0-description">
-          <small><?php echo _("Enable this option if you want RaspAP to provide IP addresses and connectivity to clients on the wired ethernet interface (eth0).") ?></small>
-          <br><small class="text-muted"><?php echo _("This option enables an additional <code>eth0</code> configuration for DHCP and dnsmasq.") ?></small>
-        </p>
-      </div>
     </div>
 
     <template id="dhcp-upstream-server">
diff --git a/templates/dhcp/general.php b/templates/dhcp/general.php
index e4023392..45b01c64 100644
--- a/templates/dhcp/general.php
+++ b/templates/dhcp/general.php
@@ -12,6 +12,22 @@
       </select>
     </div>
   </div>
+
+  <div class="row">
+    <div class="form-group col-md-6">
+      <div class="input-group">
+        <input type="hidden" name="dhcp-iface" value="0">
+        <div class="custom-control custom-switch">
+          <input class="custom-control-input" id="dhcp-iface" type="checkbox" name="dhcp-iface" value="1" <?php echo $dhcp_iface_enable ? ' checked="checked"' : "" ?> aria-describedby="dhcp-iface-description">
+          <label class="custom-control-label" for="dhcp-iface"><?php echo _("Enable DHCP for this interface") ?></label>
+        </div>
+        <p id="dhcp-iface-description">
+          <small><?php echo _("Enable this option if you want RaspAP assign IP addresses on the selected interface.") ?></small>
+        </p>
+      </div>
+     </div>
+  </div>
+
   <div class="row">
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("Starting IP Address"); ?></label>