dns.cgi: Show recursor mode message even when we have some servers to show

The message was not shown when we have received DNS servers from the
provider.

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

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 4986317f82f44dd9304921e9e4b0a6e6d79efda1..10c2f87ce6f6a0295e41c29d1ab2795991e03c21 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -621,6 +621,7 @@ WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisati
 WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
 WARNING: untranslated string: dns proxy server = DNS Proxy Server
+WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns title = Domain Name System
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 4ea707702e5ce9fc88f5184c50b8c0991fe0a67e..b97d017c3ab0b6d903fa2baac3d26f5bd1c3db0b 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -832,6 +832,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
 WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
+WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index f5f67243a755572a2aa0759a3917bbb4f9de73da..8e9d7babb0ce22ed0801c3b7e95b9e985a59e668 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -821,6 +821,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
 WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
+WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

diff --git a/doc/language_issues.it b/doc/language_issues.it
index b83cdde9a8258713b2e9943dafe6aaac8fbb49c9..a4ea5e6183a8e94fcfac2efcbf8c8e32cd70ee20 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -855,6 +855,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
 WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
+WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 003c9b6fe824143f82751a81b16daeaf233c69fa..ca1dee9b55b33b891e9c29d684afbb1b25f743e1 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -855,6 +855,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
 WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
+WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 4ea707702e5ce9fc88f5184c50b8c0991fe0a67e..b97d017c3ab0b6d903fa2baac3d26f5bd1c3db0b 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -832,6 +832,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
 WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
+WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index b783639a018e8d4ff96485466f3f42dbc2600bf9..b76c83e567e8e8629321d4a4567c902bac5e1a62 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -836,6 +836,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
 WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
+WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 08702c67ddc8c12d55d1739ea24bff6028ef9721..ef28f6ac8019395a5e0d914738ef84fd0dfe220f 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -832,6 +832,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi
 WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation
 WARNING: untranslated string: dns no address given = No IP Address given.
 WARNING: untranslated string: dns no tls hostname given = No TLS hostname given.
+WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

diff --git a/doc/language_missings b/doc/language_missings
index 379eb9f6143c2248523f2a62103415377c79f539..40724a80b288e85c653f2323396ffa31e4875664 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -263,6 +263,7 @@
 < dns mode for qname minimisation
 < dns no address given
 < dns no tls hostname given
+< dns recursor mode
 < dnssec aware
 < dnssec disabled warning
 < dnssec information
@@ -935,6 +936,7 @@
 < dns mode for qname minimisation
 < dns no address given
 < dns no tls hostname given
+< dns recursor mode
 < dns tls hostname
 < dns use isp assigned nameservers
 < dns use protocol for dns queries
@@ -1046,6 +1048,7 @@
 < dns mode for qname minimisation
 < dns no address given
 < dns no tls hostname given
+< dns recursor mode
 < dnssec disabled warning
 < dns tls hostname
 < dns use isp assigned nameservers
@@ -1389,6 +1392,7 @@
 < dns mode for qname minimisation
 < dns no address given
 < dns no tls hostname given
+< dns recursor mode
 < dnssec aware
 < dnssec disabled warning
 < dnssec information
@@ -1851,6 +1855,7 @@
 < dns mode for qname minimisation
 < dns no address given
 < dns no tls hostname given
+< dns recursor mode
 < dnssec aware
 < dnssec disabled warning
 < dnssec information
@@ -2684,6 +2689,7 @@
 < dns mode for qname minimisation
 < dns no address given
 < dns no tls hostname given
+< dns recursor mode
 < dnssec aware
 < dnssec disabled warning
 < dnssec information
@@ -3366,6 +3372,7 @@
 < dns mode for qname minimisation
 < dns no address given
 < dns no tls hostname given
+< dns recursor mode
 < dns tls hostname
 < dns use isp assigned nameservers
 < dns use protocol for dns queries

diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index d4278d8b9a484825f76f162365b9c4a68902c569..aac7955ec19d717db2798368153f46298b32da3c 100755 (executable)
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -418,10 +418,18 @@ END
 sub show_nameservers () {
        &Header::openbox('100%', 'center', "$Lang::tr{'dns title'}");
 
+       # Determine if we are running in recursor mode
+       my $recursor = 0;
+       my $unbound_forward = qx(unbound-control forward);
+       if ($unbound_forward =~ m/^off/) {
+               $recursor = 1;
+       }
+
        my $dns_status_string;
        my $dns_status_col;
        my $dns_working;
 
+
        # Test if the DNS system is working.
        #
        # Simple send a request to unbound and check if it can resolve the
@@ -437,6 +445,10 @@ sub show_nameservers () {
                $dns_status_col = "${Header::colourred}";
        }
 
+       if ($recursor) {
+               $dns_status_string .= " (" . $Lang::tr{'dns recursor mode'} . ")";
+       }
+
 print <<END;
                <table width='100%'>
                        <tr>
@@ -705,25 +717,16 @@ print <<END;
                </table>
 END
 ;
-
                } else {
-print <<END;
+                       print <<END;
                <table width="100%">
-                       <tr>
-                               <td colspan="6" align="center">
-                                       <br>$Lang::tr{'dns recursor mode'}<br>
-                               </td>
-                       </tr>
-
                        <tr>
                                <form method="post" action="$ENV{'SCRIPT_NAME'}">
                                        <td colspan="6" align="right"><input type="submit" name="SERVERS" value="$Lang::tr{'add'}"></td>
                                </form>
                        </tr>
                </table>
-
 END
-;
                }
 
        &Header::closebox();

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 2cd2e24a2d6b6d38821af9c64f9ec50b4a515fc5..80579e7cc041062c445c3397317e38615b7c645d 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -825,6 +825,7 @@
 'dns new 0' => 'Neue <strong>primäre</strong> DNS Server IP:',
 'dns new 1' => 'Neue <strong>sekundäre</strong> DNS Server IP:',
 'dns proxy server' => 'DNS-Proxyserver',
+'dns recursor mode' => 'Recursor-Modus',
 'dns saved' => 'Erfolgreich gespeichert!',
 'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.<br/>Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!',
 'dns server' => 'DNS Server',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index dfc7e013ffaf09ee0079217181f7c8a3bf8b1303..1f81108f121fe2d7aa1f1953042c240d7f79ef0f 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -862,7 +862,7 @@
 'dns no address given' => 'No IP Address given.',
 'dns no tls hostname given' => 'No TLS hostname given.',
 'dns proxy server' => 'DNS Proxy Server',
-'dns recursor mode' => 'Running in Recursor mode.',
+'dns recursor mode' => 'Recursor Mode',
 'dns saved' => 'Successfully saved!',
 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
 'dns server' => 'DNS Server',