dnsbl.cgi: Add a heading for the ACLs

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 0f5083bf6299ef25a8f33292b4e6ae1c2d2480de..a44f429cb5c703851457c398d0ec37c498a0e1c6 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -260,9 +260,9 @@ WARNING: translation string unused: dns new 0
 WARNING: translation string unused: dns new 1
 WARNING: translation string unused: dns saved
 WARNING: translation string unused: dns saved txt
+WARNING: translation string unused: dnsbl acl
 WARNING: translation string unused: dnsbl custom source
 WARNING: translation string unused: dnsbl dns firewall
-WARNING: translation string unused: dnsbl edit zone acl
 WARNING: translation string unused: dnsbl lists
 WARNING: translation string unused: dnssec disabled warning
 WARNING: translation string unused: dnssec information

diff --git a/doc/language_missings b/doc/language_missings
index 0f1c3eafb2d8fceaa1a988a9785c9b24517452b5..b65162d559ad2ebfa6ae0396fcae436a44f50986 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -160,9 +160,9 @@
 < AES-256-CBC
 < AES-256-GCM
 < CHACHA20-POLY1305
+< dnsbl acl
 < dnsbl custom source
 < dnsbl dns firewall
-< dnsbl edit zone acl
 < dnsbl lists
 < dns servers
 < download report
@@ -264,9 +264,9 @@
 < CHACHA20-POLY1305
 < configuration file
 < data transfer
+< dnsbl acl
 < dnsbl custom source
 < dnsbl dns firewall
-< dnsbl edit zone acl
 < dnsbl lists
 < done
 < download report
@@ -581,9 +581,9 @@
 < disable
 < Disabled
 < disconnected
+< dnsbl acl
 < dnsbl custom source
 < dnsbl dns firewall
-< dnsbl edit zone acl
 < dnsbl lists
 < dns check servers
 < dns configuration
@@ -1279,9 +1279,9 @@
 < disable
 < Disabled
 < disconnected
+< dnsbl acl
 < dnsbl custom source
 < dnsbl dns firewall
-< dnsbl edit zone acl
 < dnsbl lists
 < dns check servers
 < dns configuration
@@ -2042,9 +2042,9 @@
 < Disabled
 < disconnected
 < dnat address
+< dnsbl acl
 < dnsbl custom source
 < dnsbl dns firewall
-< dnsbl edit zone acl
 < dnsbl lists
 < dns check servers
 < dns configuration
@@ -3213,9 +3213,9 @@
 < disconnected
 < disk access
 < dnat address
+< dnsbl acl
 < dnsbl custom source
 < dnsbl dns firewall
-< dnsbl edit zone acl
 < dnsbl lists
 < dns check servers
 < dns configuration
@@ -4248,9 +4248,9 @@
 < disable
 < Disabled
 < disconnected
+< dnsbl acl
 < dnsbl custom source
 < dnsbl dns firewall
-< dnsbl edit zone acl
 < dnsbl lists
 < dns check servers
 < dns configuration
@@ -4693,9 +4693,9 @@
 < aliases default interface
 < Captive wrong type
 < CHACHA20-POLY1305
+< dnsbl acl
 < dnsbl custom source
 < dnsbl dns firewall
-< dnsbl edit zone acl
 < dnsbl lists
 < dns servers
 < download report
@@ -4805,9 +4805,9 @@
 < aliases default interface
 < Captive wrong type
 < CHACHA20-POLY1305
+< dnsbl acl
 < dnsbl custom source
 < dnsbl dns firewall
-< dnsbl edit zone acl
 < dnsbl lists
 < dns servers
 < download report

diff --git a/html/cgi-bin/dnsbl.cgi b/html/cgi-bin/dnsbl.cgi
index ffc7249613e0f987672ce058ef400e410b4975d2..2349c29986eb11fe1f5290cea405bc0b052230c8 100755 (executable)
--- a/html/cgi-bin/dnsbl.cgi
+++ b/html/cgi-bin/dnsbl.cgi
@@ -246,13 +246,19 @@ sub show_edit_zone() {
        my @enabled_zones = split(/\|/, $settings{$zone}[2]);
        my @custom_acl = split(/\|/, $settings{$zone}[3]);
 
-       &Header::openbox('100%', 'center', $list->{"name"} . ": " . $Lang::tr{"dnsbl edit zone acl"});
+       &Header::openbox('100%', 'center', $list->{"name"});
 
 print <<END;
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <input type='hidden' name='ZONE' value='$zone'>
 
                <table class="form">
+                       <tr class="header">
+                               <td colspan="2">
+                                       $Lang::tr{"dnsbl acl"}
+                               </td>
+                       </tr>
+
                        <tr>
                                <td>
                                        $Lang::tr{"network zone"}

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 682ee56d3d0bdb89faf77d2dd752bfb5e5f32e9e..4cc14f7e027042b94d2968c23cb260de709f2ca1 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -858,9 +858,9 @@
 'dns tls hostname' => 'TLS-Hostname',
 'dns use isp assigned nameservers' => 'Vom ISP zugewiesene DNS-Server verwenden',
 'dns use protocol for dns queries' => 'Für DNS-Anfragen zu verwendendes Protokoll',
+'dnsbl acl' => 'Zugriffskontrolle',
 'dnsbl custom source' => 'Benutzerdefinierte Quelle',
 'dnsbl dns firewall' => 'DNS-Firewall',
-'dnsbl edit zone acl' => 'Zonen-ACL bearbeiten',
 'dnsbl lists' => 'Listen',
 'dnsforward' => 'DNS-Weiterleitung',
 'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index d1239f2ac5f3a6da021f70cfbc80e0bd34bb8c29..b23a73d70626e36f852306b9f7758624505a97ae 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -907,9 +907,9 @@
 'dns tls hostname' => 'TLS Hostname',
 'dns use isp assigned nameservers' => 'Use ISP-assigned DNS servers',
 'dns use protocol for dns queries' => 'Protocol for DNS queries',
+'dnsbl acl' => 'Access Control',
 'dnsbl custom source' => 'Custom source',
 'dnsbl dns firewall' => 'DNS Firewall',
-'dnsbl edit zone acl' => 'Edit zone ACL',
 'dnsbl lists' => 'Lists',
 'dnsforward' => 'DNS Forwarding',
 'dnsforward add a new entry' => 'Add a new entry',