Merge pull request #2073 from RaspAP/fix/dhcp-static

Fix: Save dhcpcd static IP regardless of dnsmasq config state

Author: billz

includes/dhcp.php

@@ -110,37 +110,33 @@ function saveDHCPConfig($status)
     $dnsmasq = new DnsmasqManager();
     $iface = $_POST['interface'];
 
-    // dhcp
-    if (!isset($_POST['dhcp-iface']) && file_exists(RASPI_DNSMASQ_PREFIX.$iface.'.conf')) {
-        // remove dhcp + dnsmasq configs for selected interface
-        $return = $dhcpcd->remove($iface, $status);
-        $return = $dnsmasq->remove($iface, $status);
+    // Always save dhcpcd static IP config
+    $errors = $dhcpcd->validate($_POST);
+    if (empty($errors)) {
+        $dhcp_cfg = $dhcpcd->buildConfigEx($iface, $_POST, $status);
+        $dhcpcd->saveConfig($dhcp_cfg, $iface, $status);
     } else {
-        $errors = $dhcpcd->validate($_POST);
+        foreach ($errors as $error) {
+            $status->addMessage($error, 'danger');
+        }
+    }
+
+    // dnsmasq: remove if DHCP was previously enabled but now disabled
+    if (!isset($_POST['dhcp-iface']) && file_exists(RASPI_DNSMASQ_PREFIX.$iface.'.conf')) {
+        $dnsmasq->remove($iface, $status);
+    } elseif (($_POST['dhcp-iface'] ?? '') == "1" || isset($_POST['mac'])) {
+        $errors = $dnsmasq->validate($_POST);
         if (empty($errors)) {
-            $dhcp_cfg = $dhcpcd->buildConfigEx($iface, $_POST, $status);
-            $dhcpcd->saveConfig($dhcp_cfg, $iface, $status);
+            $config = $dnsmasq->buildConfigEx($iface, $_POST);
+            $return = $dnsmasq->saveConfig($config, $iface);
+            $config = $dnsmasq->buildDefault($_POST);
+            $return = $dnsmasq->saveConfigDefault($config);
         } else {
             foreach ($errors as $error) {
                 $status->addMessage($error, 'danger');
             }
         }
-
-        // dnsmasq
-        if (($_POST['dhcp-iface'] == "1") || (isset($_POST['mac']))) {
-            $errors = $dnsmasq->validate($_POST);
-            if (empty($errors)) {
-                $config = $dnsmasq->buildConfigEx($iface, $_POST);
-                $return = $dnsmasq->saveConfig($config, $iface);
-                $config = $dnsmasq->buildDefault($_POST);
-                $return = $dnsmasq->saveConfigDefault($config);
-            } else {
-                foreach ($errors as $error) {
-                    $status->addMessage($error, 'danger');
-                }
-            }
-        }
-        return true;
     }
+    return true;
 }
 

src/RaspAP/Networking/Hotspot/DhcpcdManager.php

@@ -177,10 +177,10 @@ public function buildConfigEx(string $iface, array $post_data, StatusMessage $st
         if (isset($post_data['DefaultGateway']) && $post_data['DefaultGateway'] !== '') {
             $cfg[] = 'static routers='.$post_data['DefaultGateway'];
         }
-        if ($post_data['DNS1'] !== '' || $post_data['DNS2'] !== '') {
-            $cfg[] = 'static domain_name_servers='.$post_data['DNS1'].' '.$post_data['DNS2'];
+        if (!empty($post_data['DNS1']) || !empty($post_data['DNS2'])) {
+            $cfg[] = 'static domain_name_servers='.trim(($post_data['DNS1'] ?? '').' '.($post_data['DNS2'] ?? ''));
         }
-        if ($post_data['Metric'] !== '') {
+        if (!empty($post_data['Metric'])) {
             $cfg[] = 'metric '.$post_data['Metric'];
         }
         if (($post_data['Fallback'] ?? 0) == 1) {
@@ -305,6 +305,7 @@ public function remove(string $iface, StatusMessage $status): bool
                 return false;
             }
         }
+        return false;
     }
 
     /**