public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* [PATCH 1/3] dns.cgi: Do not show table header if no servers are configured
@ 2020-02-05 14:27 Michael Tremer
  2020-02-05 14:27 ` [PATCH 2/3] aws-setup: Remove some excessive whitespace Michael Tremer
  2020-02-05 14:27 ` [PATCH 3/3] cloud-init: Disable using ISP nameservers Michael Tremer
  0 siblings, 2 replies; 3+ messages in thread
From: Michael Tremer @ 2020-02-05 14:27 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 3000 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/dns.cgi | 71 ++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index 4f3418a70..09fd50206 100755
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -449,7 +449,7 @@ sub show_nameservers () {
 		$dns_status_string .= " (" . $Lang::tr{'dns recursor mode'} . ")";
 	}
 
-print <<END;
+	print <<END;
 		<table width='100%'>
 			<tr>
 				<td>
@@ -458,7 +458,36 @@ print <<END;
 				</td>
 			</tr>
 		</table>
+END
+
+	# Check the usage of ISP assigned nameservers is enabled.
+	my $id = 1;
+
+	# Loop through the array which stores the files.
+	foreach my $file (@ISP_nameserver_files) {
+		# Grab the address of the nameserver.
+		my $address = &General::grab_address_from_file($file);
+
+		# Check if we got an address.
+		if ($address) {
+			# Add the address to the hash of nameservers.
+			$dns_servers{$id} = [ "$address", "none",
+				($settings{'USE_ISP_NAMESERVERS'} eq "on") ? "enabled" : "disabled",
+				"$Lang::tr{'dns isp assigned nameserver'}" ];
+
+			# Increase id by one.
+			$id++;
+		}
+	}
 
+	# Check some DNS servers have been configured. In this case
+	# the hash contains at least one key.
+	my $server_amount;
+	if (keys %dns_servers) {
+		# Sort the keys by their ID and store them in an array.
+		my @keys = sort { $a <=> $b } keys %dns_servers;
+
+		print <<END;
 		<br>
 
 		<table class="tbl" width='100%'>
@@ -479,51 +508,23 @@ print <<END;
 					<strong>$Lang::tr{'remark'}</strong>
 				</td>
 END
-	# Check if the status should be displayed.
-	if ($check_servers) {
-print <<END
+
+		# Check if the status should be displayed.
+		if ($check_servers) {
+			print <<END;
 				<td align="center">
 					<strong>$Lang::tr{'status'}</strong>
 				</td>
 END
-;
-	}
+		}
 
-print <<END
+		print <<END;
 
 				<td align="center" colspan="3">
 					<strong>$Lang::tr{'action'}</strong>
 				</td>
 			</tr>
 END
-;
-
-		# Check the usage of ISP assigned nameservers is enabled.
-		my $id = 1;
-
-		# Loop through the array which stores the files.
-		foreach my $file (@ISP_nameserver_files) {
-			# Grab the address of the nameserver.
-			my $address = &General::grab_address_from_file($file);
-
-			# Check if we got an address.
-			if ($address) {
-				# Add the address to the hash of nameservers.
-				$dns_servers{$id} = [ "$address", "none",
-					($settings{'USE_ISP_NAMESERVERS'} eq "on") ? "enabled" : "disabled",
-					"$Lang::tr{'dns isp assigned nameserver'}" ];
-
-				# Increase id by one.
-				$id++;
-			}
-		}
-
-		# Check some DNS servers have been configured. In this case
-		# the hash contains at least one key.
-		my $server_amount;
-		if (keys %dns_servers) {
-			# Sort the keys by their ID and store them in an array.
-			my @keys = sort { $a <=> $b } keys %dns_servers;
 
 			# Loop through all entries of the array/hash.
 			foreach my $id (@keys) {
-- 
2.20.1


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-05 14:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-05 14:27 [PATCH 1/3] dns.cgi: Do not show table header if no servers are configured Michael Tremer
2020-02-05 14:27 ` [PATCH 2/3] aws-setup: Remove some excessive whitespace Michael Tremer
2020-02-05 14:27 ` [PATCH 3/3] cloud-init: Disable using ISP nameservers Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox