From 46cef8a72d1b066286dfd30f22f67208a30d5104 Mon Sep 17 00:00:00 2001
From: Stephan de Wit <stephan.de.wit@deciso.com>
Date: Wed, 3 May 2023 10:20:51 +0200
Subject: [PATCH] unbound: general: include statistics toggle for general page
 migration

---
 .../mvc/app/models/OPNsense/Unbound/Migrations/M1_0_6.php   | 1 +
 src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml    | 4 ++++
 src/www/reporting_settings.php                              | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Unbound/Migrations/M1_0_6.php b/src/opnsense/mvc/app/models/OPNsense/Unbound/Migrations/M1_0_6.php
index 6275b11de..ed444f623 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Unbound/Migrations/M1_0_6.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Unbound/Migrations/M1_0_6.php
@@ -108,5 +108,6 @@ class M1_0_6 extends BaseModelMigration
     {
         $config = Config::getInstance()->object();
         unset($config->unbound->acls);
+        unset($config->unbound);
     }
 }
diff --git a/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml b/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
index a151ed5a0..77c5ede03 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
@@ -12,6 +12,10 @@
                 <default>53</default>
                 <Required>Y</Required>
             </port>
+            <stats type="BooleanField">
+                <default>0</default>
+                <Required>N</Required>
+            </stats>
             <active_interface type=".\UnboundInterfaceField">
                 <Required>N</Required>
                 <Multiple>Y</Multiple>
diff --git a/src/www/reporting_settings.php b/src/www/reporting_settings.php
index 01e58cd7c..334653c00 100644
--- a/src/www/reporting_settings.php
+++ b/src/www/reporting_settings.php
@@ -36,12 +36,12 @@ require_once("system.inc");
 require_once("plugins.inc.d/unbound.inc");
 
 $rrdcfg = &config_read_array('rrd');
-$unboundcfg = &config_read_array('unbound');
+$unboundcfg = &config_read_array('OPNsense', 'unboundplus', 'general');
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig = [];
     $pconfig['rrdenable'] = isset($rrdcfg['enable']);
-    $pconfig['unboundenable'] = isset($unboundcfg['stats']);
+    $pconfig['unboundenable'] = !empty($unboundcfg['stats']);
 } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
     $pconfig = $_POST;
     $configure_unbound = false;
@@ -60,7 +60,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
         configd_run('netflow aggregate repair', true);
     } elseif (!empty($pconfig['action']) && $pconfig['action'] == "SaveDNS") {
         $configure_unbound = true;
-        $unboundcfg['stats'] = !empty($pconfig['unboundenable']);
+        $unboundcfg['stats'] = !empty($pconfig['unboundenable']) ? '1' : '0';
         $savemsg = get_std_save_message();
         write_config();
     } elseif (!empty($pconfig['action']) && $pconfig['action'] == "ResetDNS") {