From 07d7c28c802250194db062beb1c0ff5ce784ff7e Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 20 Jul 2021 17:23:25 +0200 Subject: [PATCH] unbound: shrink implementation of previous #4327 --- .../models/OPNsense/Unbound/Migrations/M1_0_0.php | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/Unbound/Migrations/M1_0_0.php b/src/opnsense/mvc/app/models/OPNsense/Unbound/Migrations/M1_0_0.php index a5207aebe..7959657f6 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Unbound/Migrations/M1_0_0.php +++ b/src/opnsense/mvc/app/models/OPNsense/Unbound/Migrations/M1_0_0.php @@ -60,20 +60,11 @@ class M1_0_0 extends BaseModelMigration foreach (explode(',', (string)$mdlNode->miscellaneous->dotservers) as $dot) { $dotNode = $model->dots->dot->add(); $dotData = explode('@', $dot, 2); - - $dotEnabled = new BooleanField('enabled', 'enabled'); - $dotEnabled->setValue('1'); - $dotNode->addChildNode('enabled', $dotEnabled); - - $dotServer = new NetworkField('server', 'server'); - $dotServer->setValue($dotData[0]); - $dotNode->addChildNode('server', $dotServer); - + $dotContent = [ 'enabled' => 1, 'server' => $dotData[0] ]; if (!empty($dotData[1])) { - $dotPort = new PortField('port', 'port'); - $dotPort->setValue($dotData[1]); - $dotNode->addChildNode('port', $dotPort); + $dotContent['port'] = $dotData[1]; } + $dotNode->setNodes($dotContent); } } }