From 25c074ce23fce3e99a69238f96b4b0b39d45fdb8 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 26 Feb 2016 14:00:21 +0100
Subject: [PATCH] (legacy) simplify things a bit in
 services_unbound_advanced.php

---
 src/www/services_unbound_advanced.php | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/www/services_unbound_advanced.php b/src/www/services_unbound_advanced.php
index 15aed0f55..830784693 100644
--- a/src/www/services_unbound_advanced.php
+++ b/src/www/services_unbound_advanced.php
@@ -39,7 +39,7 @@ if(empty($config['unbound']) || !is_array($config['unbound'])) {
 
 $copy_fields = array('msgcachesize', 'outgoing_num_tcp', 'incoming_num_tcp', 'edns_buffer_size',
                     'num_queries_per_thread', 'jostle_timeout', 'cache_max_ttl', 'cache_min_ttl',
-                    'infra_host_ttl', 'infra_cache_numhosts','unwanted_reply_threshold');
+                    'infra_host_ttl', 'infra_cache_numhosts','unwanted_reply_threshold', 'log_verbosity');
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig = array();
@@ -51,6 +51,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig['infra_cache_numhosts'] = 10000;
     $pconfig['edns_buffer_size'] = 4096;
     $pconfig['num_queries_per_thread'] = 4096;
+    $pconfig['log_verbosity'] = "1";
 
     // boolean fields
     $pconfig['hideidentity'] = isset($config['unbound']['hideidentity']);
@@ -59,9 +60,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig['prefetchkey'] = isset($config['unbound']['prefetchkey']);
     $pconfig['dnssecstripped'] = isset($config['unbound']['dnssecstripped']);
 
-    // predefined
-    $pconfig['log_verbosity'] = isset($config['unbound']['log_verbosity']) ? $config['unbound']['log_verbosity'] : "1";
-
     // text fields
     foreach ($copy_fields as $fieldname) {
         if (isset($config['unbound'][$fieldname])) {
@@ -78,25 +76,20 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
         exit;
     } else {
         $pconfig = $_POST;
+        // boolean fields
         $config['unbound']['hideidentity'] =  !empty($pconfig['hideidentity']);
         $config['unbound']['hideversion'] =  !empty($pconfig['hideversion']);
         $config['unbound']['prefetch'] =  !empty($pconfig['prefetch']);
         $config['unbound']['prefetchkey'] =  !empty($pconfig['prefetchkey']);
         $config['unbound']['dnssecstripped'] =  !empty($pconfig['dnssecstripped']);
-        $config['unbound']['msgcachesize'] = $pconfig['msgcachesize'];
-        $config['unbound']['outgoing_num_tcp'] = $pconfig['outgoing_num_tcp'];
-        $config['unbound']['incoming_num_tcp'] = $pconfig['incoming_num_tcp'];
-        $config['unbound']['edns_buffer_size'] = $pconfig['edns_buffer_size'];
-        $config['unbound']['num_queries_per_thread'] = $pconfig['num_queries_per_thread'];
-        $config['unbound']['jostle_timeout'] = $pconfig['jostle_timeout'];
-        $config['unbound']['cache_max_ttl'] = $pconfig['cache_max_ttl'];
-        $config['unbound']['cache_min_ttl'] = $pconfig['cache_min_ttl'];
-        $config['unbound']['infra_host_ttl'] = $pconfig['infra_host_ttl'];
-        $config['unbound']['infra_cache_numhosts'] = $pconfig['infra_cache_numhosts'];
-        $config['unbound']['unwanted_reply_threshold'] = $pconfig['unwanted_reply_threshold'];
-        $config['unbound']['log_verbosity'] = $pconfig['log_verbosity'];
+        // text fields
+        foreach ($copy_fields as $fieldname) {
+            $config['unbound'][$fieldname] = $pconfig[$fieldname];
+        }
         write_config("DNS Resolver configured.");
         mark_subsystem_dirty('unbound');
+        header("Location: services_unbound_advanced.php");
+        exit;
     }
 }