From 351ad526b23daa2e36a7e09c5c2c7e59d4a35259 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 29 Jan 2020 11:40:59 +0100
Subject: [PATCH] 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>
---
 doc/language_issues.en |  1 +
 doc/language_issues.es |  1 +
 doc/language_issues.fr |  1 +
 doc/language_issues.it |  1 +
 doc/language_issues.nl |  1 +
 doc/language_issues.pl |  1 +
 doc/language_issues.ru |  1 +
 doc/language_issues.tr |  1 +
 doc/language_missings  |  7 +++++++
 html/cgi-bin/dns.cgi   | 23 +++++++++++++----------
 langs/de/cgi-bin/de.pl |  1 +
 langs/en/cgi-bin/en.pl |  2 +-
 12 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 4986317f82..10c2f87ce6 100644
--- 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 4ea707702e..b97d017c3a 100644
--- 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 f5f67243a7..8e9d7babb0 100644
--- 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 b83cdde9a8..a4ea5e6183 100644
--- 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 003c9b6fe8..ca1dee9b55 100644
--- 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 4ea707702e..b97d017c3a 100644
--- 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 b783639a01..b76c83e567 100644
--- 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 08702c67dd..ef28f6ac80 100644
--- 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 379eb9f614..40724a80b2 100644
--- 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 d4278d8b9a..aac7955ec1 100755
--- 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 2cd2e24a2d..80579e7cc0 100644
--- 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 dfc7e013ff..1f81108f12 100644
--- 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',
-- 
2.39.2