diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/SettingsController.php b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/SettingsController.php index 6b74c468c..825d946e6 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/SettingsController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/SettingsController.php @@ -40,7 +40,8 @@ class SettingsController extends ApiMutableModelControllerBase private $type = 'dot'; - public function toggleSystemForwardAction() { + public function toggleSystemForwardAction() + { if ($this->request->isPost() && $this->request->hasPost('forwarding')) { $this->sessionClose(); Config::getInstance()->lock(); @@ -58,10 +59,10 @@ class SettingsController extends ApiMutableModelControllerBase /* save and release lock */ Config::getInstance()->save(); } - } - public function getSystemForwardAction() { + public function getSystemForwardAction() + { $config = Config::getInstance()->object(); return array("forwarding" => array( "enabled" => @@ -70,7 +71,8 @@ class SettingsController extends ApiMutableModelControllerBase ); } - public function getNameserversAction() { + public function getNameserversAction() + { if ($this->request->isGet()) { $backend = new Backend(); $nameservers = json_decode(trim($backend->configdRun("system list nameservers"))); @@ -132,7 +134,9 @@ class SettingsController extends ApiMutableModelControllerBase public function addForwardAction() { - return $this->addBase('dot', 'dots.dot', + return $this->addBase( + 'dot', + 'dots.dot', [ "type" => $this->type ] ); } @@ -144,7 +148,10 @@ class SettingsController extends ApiMutableModelControllerBase public function setForwardAction($uuid) { - return $this->setBase('dot', 'dots.dot', $uuid, + return $this->setBase( + 'dot', + 'dots.dot', + $uuid, [ "type" => $this->type ] ); } diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/forwarding.xml b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/forwarding.xml index c30f41293..241720430 100755 --- a/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/forwarding.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/forwarding.xml @@ -1,17 +1,17 @@ -
- - forwarding.enabled - - checkbox - - - The configured system nameservers will be used to forward queries to. - This will override any entry in the grid below. - - - - forwarding.info - info - - -
+
+ + forwarding.enabled + + checkbox + + + The configured system nameservers will be used to forward queries to. + This will override any entry in the grid below. + + + + forwarding.info + info + + +
diff --git a/src/opnsense/service/templates/OPNsense/Unbound/core/dot.conf b/src/opnsense/service/templates/OPNsense/Unbound/core/dot.conf index 7ced40f1f..f5cbd3265 100644 --- a/src/opnsense/service/templates/OPNsense/Unbound/core/dot.conf +++ b/src/opnsense/service/templates/OPNsense/Unbound/core/dot.conf @@ -50,4 +50,3 @@ forward-zone: {% endfor %} {% endif %} {% endif %} -