From b67a1d49bf7aa78694620b19bc6981e409266356 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 11 Jan 2023 10:07:27 +0100 Subject: [PATCH] dns/bind: more style updates --- .../OPNsense/Bind/Api/DomainController.php | 48 +++++++------- .../OPNsense/Bind/Migrations/M1_1_0.php | 63 +++++++++---------- 2 files changed, 55 insertions(+), 56 deletions(-) diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/DomainController.php b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/DomainController.php index d840caa6b..88a660522 100644 --- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/DomainController.php +++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/DomainController.php @@ -1,32 +1,30 @@ - * Copyright (C) 2019 Deciso B.V. +/* + * Copyright (C) 2019 Michael Muenz + * Copyright (C) 2019 Deciso B.V. + * All rights reserved. * - * All rights reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ namespace OPNsense\Bind\Api; @@ -39,11 +37,13 @@ class DomainController extends ApiMutableModelControllerBase protected static $internalModelName = 'domain'; protected static $internalModelClass = '\OPNsense\Bind\Domain'; - # These are here for backwards compatability, should be removed after a bit. + /* XXX backwards-compatibility for 22.7 and below */ public function searchMasterDomainAction() { return seachPrimaryDomainAction(); } + + /* XXX backwards-compatibility for 22.7 and below */ public function searchSlaveDomainAction() { return seachSecondaryDomainAction(); diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Migrations/M1_1_0.php b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Migrations/M1_1_0.php index 95d8a076f..c38c74fac 100644 --- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Migrations/M1_1_0.php +++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Migrations/M1_1_0.php @@ -1,31 +1,29 @@ object(); - # Checks to see if there is a bind config section, otherwise skips the rest of the migration + /* checks to see if there is a bind config section, otherwise skips the rest of the migration */ if (empty($config->OPNsense->bind)) { return; } $bindConfig = $config->OPNsense->bind; - # Loops through the domains in the config - foreach ($bindConfig->domain->domains->domain as $domain) { - $domainModel = $model->getNodeByReference('domains.domain.' . $domain->attributes()["uuid"]); - # Migrates the domain type - if ($domain->type == "master") { - $domainModel->type->setValue("primary"); + /* loops through the domains in the config */ + foreach ($bindConfig->domain->domains->domain as $domain) { + $domainModel = $model->getNodeByReference('domains.domain.' . $domain->attributes()['uuid']); + + /* migrates the domain type */ + if ($domain->type == 'master') { + $domainModel->type->setValue('primary'); } else { - $domainModel->type->setValue("secondary"); + $domainModel->type->setValue('secondary'); } - # Migrates the Master IP to Primary IP field + /* migrates the Master IP to Primary IP field */ if (!empty($domain->masterip)) { $domainModel->primaryip->setValue($domain->masterip); } - # Migrates the AllowNotify Slave to AllowNotify Secondary field + /* migrates the AllowNotify Slave to AllowNotify Secondary field */ if (!empty($domain->allownotifyslave)) { $domainModel->allownotifysecondary->setValue($domain->allownotifyslave); }