From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 7 Jan 2020 14:49:54 +0000 (+0000)
Subject: dns.cgi: Show ISP name servers as disabled
X-Git-Tag: v2.25-core141~70^2~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77c7a94cdd6d0cf6fa1a48cd1248205dea1d6069;p=ipfire-2.x.git

dns.cgi: Show ISP name servers as disabled

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

diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index a878f1786b..6ec295dea7 100755
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -421,22 +421,22 @@ print <<END;
 END
 
 		# Check the usage of ISP assigned nameservers is enabled.
-		if ($settings{'USE_ISP_NAMESERVERS'} eq "on") {
-			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 = &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", "enabled", "$Lang::tr{'dns isp assigned nameserver'}" ];
-
-					# Increase id by one.
-					$id++;
-				}
+		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 = &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++;
 			}
 		}
 
@@ -524,6 +524,11 @@ END
 
 				if (!$rdns) { $rdns = $Lang::tr{'lookup failed'}; }
 
+				# Mark ISP name servers as disabled
+				if ($id <= 2 && $enabled eq "disabled") {
+					$nameserver = "<del>$nameserver</del>";
+				}
+
 print <<END;
 			<tr>
 				<td align="center" $col>