From 3b182a3eba1dfd4bf6349ed1dccd5b29b7b84213 Mon Sep 17 00:00:00 2001
From: Robbert Rijkse <42551307+sestary@users.noreply.github.com>
Date: Tue, 10 Jan 2023 02:51:00 -0500
Subject: [PATCH] dns/bind: cleanup master/slave zone UI (#3224)

---
 dns/bind/pkg-descr                            |  1 +
 .../Bind/forms/dialogEditBindMasterDomain.xml | 50 -------------------
 .../Bind/forms/dialogEditBindSlaveDomain.xml  |  4 +-
 .../mvc/app/views/OPNsense/Bind/general.volt  |  2 -
 4 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/dns/bind/pkg-descr b/dns/bind/pkg-descr
index 65e8d0fe2..864f2cc0f 100644
--- a/dns/bind/pkg-descr
+++ b/dns/bind/pkg-descr
@@ -11,6 +11,7 @@ Plugin Changelog
 
 1.25
 
+* Cleanup/Fix the Master/Slave domain dialogs (contributed by Robbert Rijkse)
 * Revamp the logging page with proper columns (contributed by Robbert Rijkse)
 * Update base to BIND 9.18
 
diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindMasterDomain.xml b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindMasterDomain.xml
index c7ccbfbb7..2141fb0ad 100644
--- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindMasterDomain.xml
+++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindMasterDomain.xml
@@ -23,56 +23,6 @@
         <type>dropdown</type>
         <help>Define an ACL where you allow which client are allowed to query this zone.</help>
     </field>
-    <field>
-        <id>domain.type</id>
-        <label>Type</label>
-        <type>dropdown</type>
-        <help>Set the type for this zone.</help>
-    </field>
-    <field>
-        <label>Slave Zone</label>
-        <type>header</type>
-        <style>zone_type zone_type_slave</style>
-    </field>
-    <field>
-        <id>domain.masterip</id>
-        <label>Master IP</label>
-        <style>tokenize</style>
-        <type>select_multiple</type>
-        <allownew>true</allownew>
-        <help>Set the IP address of master server when using slave mode.</help>
-    </field>
-    <field>
-        <id>domain.transferkeyalgo</id>
-        <label>Transfer Key Algorithm</label>
-        <type>dropdown</type>
-        <help>Set the authentication algorithm for the TSIG key used to transfer domain data from the master server.</help>
-    </field>
-    <field>
-        <id>domain.transferkeyname</id>
-        <label>Transfer Key Name</label>
-        <type>text</type>
-        <help>The name of the TSIG key, which must match the value on the master server.</help>
-    </field>
-    <field>
-        <id>domain.transferkey</id>
-        <label>Transfer Key</label>
-        <type>text</type>
-        <help>The base64-encoded TSIG key.</help>
-    </field>
-    <field>
-        <id>domain.allownotifyslave</id>
-        <label>Allow Notfiy</label>
-        <style>tokenize</style>
-        <type>select_multiple</type>
-        <allownew>true</allownew>
-        <help>A list of allowed IP addresses to receive notifies from.</help>
-    </field>
-    <field>
-        <label>Master Zone</label>
-        <type>header</type>
-        <style>zone_type zone_type_master</style>
-    </field>
     <field>
         <id>domain.ttl</id>
         <label>TTL</label>
diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindSlaveDomain.xml b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindSlaveDomain.xml
index c7789f46a..3b7ebd9b9 100644
--- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindSlaveDomain.xml
+++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindSlaveDomain.xml
@@ -47,7 +47,7 @@
         <id>domain.transferkey</id>
         <label>Transfer Key</label>
         <type>text</type>
-        <help>The base64-encoded TSIG key.</help>
+        <help>The TSIG key used to transfer domain data from the master server in Base64 encoding.</help>
     </field>
     <field>
         <id>domain.allownotifyslave</id>
@@ -55,6 +55,6 @@
         <style>tokenize</style>
         <type>select_multiple</type>
         <allownew>true</allownew>
-        <help>A list of allowed IP addresses to receive notifies from (in addition to the master server.)</help>
+        <help>A list of allowed IP addresses to receive notifies from (in addition to the master server).</help>
     </field>
 </form>
diff --git a/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt b/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt
index 3eb6b8f0c..5a8202969 100644
--- a/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt
+++ b/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt
@@ -92,7 +92,6 @@ POSSIBILITY OF SUCH DAMAGE.
             <thead>
                 <tr>
                     <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
-                    <th data-column-id="type" data-type="string" data-visible="true">{{ lang._('Type') }}</th>
                     <th data-column-id="domainname" data-type="string" data-visible="true">{{ lang._('Zone') }}</th>
                     <th data-column-id="ttl" data-type="string" data-visible="true">{{ lang._('TTL') }}</th>
                     <th data-column-id="refresh" data-type="string" data-visible="true">{{ lang._('Refresh') }}</th>
@@ -161,7 +160,6 @@ POSSIBILITY OF SUCH DAMAGE.
             <thead>
                 <tr>
                     <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
-                    <th data-column-id="type" data-type="string" data-visible="true">{{ lang._('Type') }}</th>
                     <th data-column-id="domainname" data-type="string" data-visible="true">{{ lang._('Zone') }}</th>
                     <th data-column-id="masterip" data-type="string" data-visible="true">{{ lang._('Master IPs') }}</th>
                     <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>