index.cgi: Change display of DNS servers.

Add missing colon and put them into one column in the
table.
This commit is contained in:
Michael Tremer
2014-02-20 10:55:08 +01:00
parent 5e1ee0e6e6
commit 317638e753
12 changed files with 37 additions and 16 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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>
<b>$Lang::tr{'dns servers'}:</b>
</td>
<td align="center">
$DNS1
</td>
<td align="center">
$DNS2
$dns_servers_str
</td>
<td align="center"></td>
</tr>
</table>
END

View File

@@ -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',

View File

@@ -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',