index.cgi: Change display of DNS servers.

Add missing colon and put them into one column in the
table.

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 11b63363f4d34ac8161b3f7aa98a017bf96062bf..881d31827d2a9609eeba72fb145ef75b915a10fd 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -140,6 +140,7 @@ WARNING: translation string unused: dmz pinhole configuration
 WARNING: translation string unused: dmz pinhole rule added
 WARNING: translation string unused: dmz pinhole rule removed
 WARNING: translation string unused: dmzpinholes for same net not necessary
+WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: donation-link
 WARNING: translation string unused: driver

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 017a2c4f9832df507a59cc7b9df12bea849ba3c4..611a0decb83ed583682e832c3e7e100762be9513 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -161,6 +161,7 @@ WARNING: translation string unused: dmz pinhole configuration
 WARNING: translation string unused: dmz pinhole rule added
 WARNING: translation string unused: dmz pinhole rule removed
 WARNING: translation string unused: dmzpinholes for same net not necessary
+WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: donation-link
 WARNING: translation string unused: done

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 366af4458fa0c24503171bfb6b8580d06db52518..636b05f1ef80665af2c768990eb138604bdaf5e0 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -154,6 +154,7 @@ WARNING: translation string unused: dmz pinhole configuration
 WARNING: translation string unused: dmz pinhole rule added
 WARNING: translation string unused: dmz pinhole rule removed
 WARNING: translation string unused: dmzpinholes for same net not necessary
+WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: donation-link
 WARNING: translation string unused: done
@@ -618,6 +619,7 @@ WARNING: untranslated string: dead peer detection
 WARNING: untranslated string: default ip
 WARNING: untranslated string: deprecated fs warn
 WARNING: untranslated string: dnat address
+WARNING: untranslated string: dns servers
 WARNING: untranslated string: dnsforward
 WARNING: untranslated string: dnsforward add a new entry
 WARNING: untranslated string: dnsforward configuration

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 0560b2b6c6a5d9012dd8a3a0dab4be63f40a55ec..30cc1f1f788b1a234792d24c7ba840229ad5aff8 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -154,6 +154,7 @@ WARNING: translation string unused: dmz pinhole configuration
 WARNING: translation string unused: dmz pinhole rule added
 WARNING: translation string unused: dmz pinhole rule removed
 WARNING: translation string unused: dmzpinholes for same net not necessary
+WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: donation-link
 WARNING: translation string unused: done
@@ -629,6 +630,7 @@ WARNING: untranslated string: default ip
 WARNING: untranslated string: deprecated fs warn
 WARNING: untranslated string: dnat address
 WARNING: untranslated string: dns address deleted txt
+WARNING: untranslated string: dns servers
 WARNING: untranslated string: dnsforward
 WARNING: untranslated string: dnsforward add a new entry
 WARNING: untranslated string: dnsforward configuration

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 934c538d0c39c6f74604c84c86d3f063d8e3fdf8..e04aae3199d75eaaed261065d5dd1494123dd680 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -156,6 +156,7 @@ WARNING: translation string unused: dmz pinhole configuration
 WARNING: translation string unused: dmz pinhole rule added
 WARNING: translation string unused: dmz pinhole rule removed
 WARNING: translation string unused: dmzpinholes for same net not necessary
+WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: donation-link
 WARNING: translation string unused: done
@@ -594,6 +595,7 @@ WARNING: untranslated string: ccd iroute2
 WARNING: untranslated string: dead peer detection
 WARNING: untranslated string: default ip
 WARNING: untranslated string: dnat address
+WARNING: untranslated string: dns servers
 WARNING: untranslated string: dnsforward
 WARNING: untranslated string: dnsforward add a new entry
 WARNING: untranslated string: dnsforward configuration

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 366af4458fa0c24503171bfb6b8580d06db52518..636b05f1ef80665af2c768990eb138604bdaf5e0 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -154,6 +154,7 @@ WARNING: translation string unused: dmz pinhole configuration
 WARNING: translation string unused: dmz pinhole rule added
 WARNING: translation string unused: dmz pinhole rule removed
 WARNING: translation string unused: dmzpinholes for same net not necessary
+WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: donation-link
 WARNING: translation string unused: done
@@ -618,6 +619,7 @@ WARNING: untranslated string: dead peer detection
 WARNING: untranslated string: default ip
 WARNING: untranslated string: deprecated fs warn
 WARNING: untranslated string: dnat address
+WARNING: untranslated string: dns servers
 WARNING: untranslated string: dnsforward
 WARNING: untranslated string: dnsforward add a new entry
 WARNING: untranslated string: dnsforward configuration

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index dff15bbfc2f2e5c53110cdbabf2720b5c2947987..195ffc14cbc5ba9906aafdc0a4936f34f8915fcb 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -153,6 +153,7 @@ WARNING: translation string unused: dmz pinhole configuration
 WARNING: translation string unused: dmz pinhole rule added
 WARNING: translation string unused: dmz pinhole rule removed
 WARNING: translation string unused: dmzpinholes for same net not necessary
+WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: donation-link
 WARNING: translation string unused: done
@@ -623,6 +624,7 @@ WARNING: untranslated string: default ip
 WARNING: untranslated string: deprecated fs warn
 WARNING: untranslated string: disk access per
 WARNING: untranslated string: dnat address
+WARNING: untranslated string: dns servers
 WARNING: untranslated string: dnsforward
 WARNING: untranslated string: dnsforward add a new entry
 WARNING: untranslated string: dnsforward configuration

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 620c78702eaf90152da1818211567d6c5d52a8e1..3f27ba2731ccc877013f6ec8978c19b44f1cdf52 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -161,6 +161,7 @@ WARNING: translation string unused: dmz pinhole configuration
 WARNING: translation string unused: dmz pinhole rule added
 WARNING: translation string unused: dmz pinhole rule removed
 WARNING: translation string unused: dmzpinholes for same net not necessary
+WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: donation-link
 WARNING: translation string unused: done
@@ -638,6 +639,7 @@ WARNING: untranslated string: bytes
 WARNING: untranslated string: dead peer detection
 WARNING: untranslated string: default ip
 WARNING: untranslated string: dnat address
+WARNING: untranslated string: dns servers
 WARNING: untranslated string: dpd delay
 WARNING: untranslated string: dpd timeout
 WARNING: untranslated string: drop action

diff --git a/doc/language_missings b/doc/language_missings
index 1d574644ad8c85f6ec0d937ff1091a40d4e90d5c..2ca9bf66588cfe3905512988e0d1af31f00b97d4 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -74,6 +74,7 @@
 < dnsforward entries
 < dnsforward forward_server
 < dnsforward zone
+< dns servers
 < dpd delay
 < dpd timeout
 < drop action
@@ -516,6 +517,7 @@
 < dnsforward entries
 < dnsforward forward_server
 < dnsforward zone
+< dns servers
 < dpd delay
 < dpd timeout
 < drop action
@@ -950,6 +952,7 @@
 < dnsforward entries
 < dnsforward forward_server
 < dnsforward zone
+< dns servers
 < dpd delay
 < dpd timeout
 < drop action
@@ -1363,6 +1366,7 @@
 < dnsforward entries
 < dnsforward forward_server
 < dnsforward zone
+< dns servers
 < dpd delay
 < dpd timeout
 < drop action

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 14eceac00fc2140d738e9fdbb968da20508a6bd8..ca98e7211f0b3d7eb7fbc2db072181ce6e2cff7d 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -190,28 +190,29 @@ END
        <tr><td><b>$Lang::tr{'gateway'}:</b><td align='center'>$GATEWAY</td><td></td></tr>
 END
        }
-       #Read DNS server 1
-       open (DNS1, "<${General::swroot}/red/dns1");
-       my $DNS1 = <DNS1>;
-       chomp($DNS1);
-       close DNS1;
-       #Read DNS server 2
-       open (DNS2, "<${General::swroot}/red/dns2");
-       my $DNS2 = <DNS2>;
-       chomp($DNS2);
-       close DNS2;
+
+       my @dns_servers = ();
+       foreach my $f ("${General::swroot}/red/dns1", "${General::swroot}/red/dns2") {
+               open(DNS, "<$f");
+               my $dns_server = <DNS>;
+               close(DNS);
+
+               chomp($dns_server);
+               if ($dns_server) {
+                       push(@dns_servers, $dns_server);
+               }
+       }
+       my $dns_servers_str = join(", ", @dns_servers);
 
        print <<END;
                <tr>
                        <td>
-                               <b>$Lang::tr{'dns server'}</b>
-                       </td>
-                       <td align="center">
-                               $DNS1
+                               <b>$Lang::tr{'dns servers'}:</b>
                        </td>
                        <td align="center">
-                               $DNS2
+                               $dns_servers_str
                        </td>
+                       <td align="center"></td>
                </tr>
        </table>
 END

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6d49f27e715d635133fedde19b8c2b465ced0157..4518f60e6a49ca0bce04719a28d819b4e5c6655a 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -718,7 +718,8 @@
 'dns proxy server' => 'DNS-Proxyserver',
 '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',
+'dns server' => 'DNS-Server',
+'dns servers' => 'DNS-Server',
 'dns title' => 'Domain Name System',
 '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 a5e43884249078def7c5a37798060ad4e7126669..921e1b1dc9bf4cf07e3cb0dd35eb926c770ff041 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -743,6 +743,7 @@
 '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',
+'dns servers' => 'DNS Servers',
 'dns title' => 'Domain Name System',
 'dnsforward' => 'DNS Forwarding',
 'dnsforward add a new entry' => 'Add a new entry',