wizard: change other occurrences of isset($config['dnsallowoverride']…

…) for #8352
opnsense · Mar 2, 2025 · 588566f · 588566f
1 parent a56e108
commit 588566f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
@@ -1104,7 +1104,7 @@ EOD;
             $mpdconf .= "  set ipcp no vjcomp\n";
         }
 
-        if (isset($config['system']['dnsallowoverride'])) {
+        if (!empty($config['system']['dnsallowoverride'])) {
             $mpdconf .= "  set ipcp enable req-pri-dns\n";
             $mpdconf .= "  set ipcp enable req-sec-dns\n";
         }

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
@@ -372,7 +372,7 @@ function get_nameservers($interface = null, $with_gateway = false)
         if (!empty($list)) {
             $dns_lists[] = $list;
         }
-    } elseif (isset($syscfg['dnsallowoverride'])) {
+    } elseif (!empty($syscfg['dnsallowoverride'])) {
         /* return dynamic servers as required by configuration */
         $list = shell_safe('/usr/local/sbin/ifctl -nl');
         if (!empty($list)) {

diff --git a/src/www/services_opendns.php b/src/www/services_opendns.php
@@ -89,7 +89,7 @@
                 $config['system']['dnsserver'][] = $v4_server[0];
                 $config['system']['dnsserver'][] = $v4_server[1];
             }
-            if (isset($config['system']['dnsallowoverride'])) {
+            if (!empty($config['system']['dnsallowoverride'])) {
                 unset($config['system']['dnsallowoverride']);
             }
         } else {

diff --git a/src/www/system_general.php b/src/www/system_general.php
@@ -54,7 +54,7 @@
         $savemsg = htmlspecialchars(gettext($_GET['savemsg']));
     }
 
-    $pconfig['dnsallowoverride'] = isset($config['system']['dnsallowoverride']);
+    $pconfig['dnsallowoverride'] = !empty($config['system']['dnsallowoverride']);
     if (!empty($config['system']['dnsallowoverride_exclude'])) {
         $pconfig['dnsallowoverride_exclude'] = explode(',', $config['system']['dnsallowoverride_exclude']);
     } else {
@@ -200,7 +200,6 @@
             $config['system']['dnsallowoverride'] = true;
             $config['system']['dnsallowoverride_exclude'] = implode(',', $pconfig['dnsallowoverride_exclude']);
         } elseif (isset($config['system']['dnsallowoverride'])) {
-            unset($config['system']['dnsallowoverride']);
             if (isset($config['system']['dnsallowoverride_exclude'])) {
                 unset($config['system']['dnsallowoverride_exclude']);
             }