X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fnetexternal.cgi;h=1e3760c2b339bc93828d51692dcb13edc97b5e52;hb=e2839b1a2cd0bb60a91931cb2e427370a7e5e206;hp=bcab8d3344fc3a663cf4d8ad4c163143b699ea77;hpb=bb7ba3b4046c9f9bcb741c5476f78952f994eb7d;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi
index bcab8d3344..1e3760c2b3 100644
--- a/html/cgi-bin/netexternal.cgi
+++ b/html/cgi-bin/netexternal.cgi
@@ -31,18 +31,14 @@ use IO::Socket;
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-require "${General::swroot}/geoip-functions.pl";
 require "${General::swroot}/graphs.pl";
 
-# Libloc database handle.
-my $libloc_db_handle = &GeoIP::init();
-
 my %color = ();
 my %mainsettings = ();
 my %netsettings=();
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
 
 my @graphs=();
 my %dhcpinfo=();
@@ -83,108 +79,6 @@ if ( $querry[0] ne~ ""){
 		&Header::closebox();
 	}
 
-	## DNSSEC
-	my @nameservers = ();
-	foreach my $f ("${General::swroot}/red/dns1", "${General::swroot}/red/dns2") {
-		open(DNS, "<$f");
-		my $nameserver = <DNS>;
-		close(DNS);
-
-		chomp($nameserver);
-		if ($nameserver) {
-			push(@nameservers, $nameserver);
-		}
-	}
-
-	&Header::openbox('100%', 'center', $Lang::tr{'dnssec information'});
-
-	print <<END;
-		<table class="tbl" width='66%'>
-			<thead>
-				<tr>
-					<th align="center">
-						<strong>$Lang::tr{'nameserver'}</strong>
-					</th>
-					<th align="center">
-						<strong>$Lang::tr{'country'}</strong>
-					</th>
-					<th align="center">
-						<strong>$Lang::tr{'rdns'}</strong>
-					</th>
-					<th align="center">
-						<strong>$Lang::tr{'status'}</strong>
-					</th>
-				</tr>
-			</thead>
-			<tbody>
-END
-
-	my $id = 0;
-	for my $nameserver (@nameservers) {
-		my $status = &check_dnssec($nameserver, "ping.ipfire.org");
-
-		my $colour = "";
-		my $bgcolour = "";
-		my $message = "";
-
-		# DNSSEC Not supported
-		if ($status == 0) {
-			$message = $Lang::tr{'dnssec not supported'};
-			$colour = "white";
-			$bgcolour = ${Header::colourred};
-
-		# DNSSEC Aware
-		} elsif ($status == 1) {
-			$message = $Lang::tr{'dnssec aware'};
-			$colour = "black";
-			$bgcolour = ${Header::colouryellow};
-
-		# DNSSEC Validating
-		} elsif ($status == 2) {
-			$message = $Lang::tr{'dnssec validating'};
-			$colour = "white";
-			$bgcolour = ${Header::colourgreen};
-
-		# Error
-		} else {
-			$colour = ${Header::colourred};
-		}
-
-		my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'};
-
-		# collect more information about name server (rDNS, GeoIP country code)
-		my $ccode = &GeoIP::lookup_country_code($libloc_db_handle, $nameserver);
-		my $flag_icon = &GeoIP::get_flag_icon($ccode);
-
-		my $iaddr = inet_aton($nameserver);
-		my $rdns = gethostbyaddr($iaddr, AF_INET);
-		if (!$rdns) { $rdns = $Lang::tr{'lookup failed'}; }
-
-		print <<END;
-			<tr bgcolor="$table_colour">
-				<td>
-					$nameserver
-				</td>
-				<td align="center">
-					<a href='country.cgi#$ccode'><img src="$flag_icon" border="0" alt="$ccode" title="$ccode" /></a>
-				</td>
-				<td align="center">
-					$rdns
-				</td>
-				<td bgcolor="$bgcolour" align="center">
-					<font color="$colour"><strong>$message</strong></font>
-				</td>
-			</tr>
-END
-	}
-
-	print <<END;
-			</tbody>
-		</table>
-END
-
-	&Header::closebox();
-
 	if ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/  && $netsettings{'RED_TYPE'} eq "DHCP"){
 
 		&Header::openbox('100%', 'left', "RED $Lang::tr{'dhcp configuration'}");
@@ -192,8 +86,7 @@ END
 
 			&General::readhash("${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info", \%dhcpinfo);
 
-			my $DNS1=`echo $dhcpinfo{'domain_name_servers'} | cut -f 1 -d " "`;
-			my $DNS2=`echo $dhcpinfo{'domain_name_servers'} | cut -f 2 -d " "`;
+			my ($DNS1, $DNS2) = split(/ /, $dhcpinfo{'domain_name_servers'});
 
 			my $lsetme=0;
 			my $leasetime="";
@@ -271,32 +164,3 @@ END
 	&Header::closebigbox();
 	&Header::closepage();
 }
-
-sub check_dnssec($$) {
-	my $nameserver = shift;
-	my $record = shift;
-
-	my @command = ("dig", "+dnssec", $record, "\@$nameserver");
-
-	my @output = qx(@command);
-	my $output = join("", @output);
-
-	my $status = 0;
-	if ($output =~ m/status: (\w+)/) {
-		$status = ($1 eq "NOERROR");
-
-		if (!$status) {
-			return -1;
-		}
-	}
-
-	my @flags = ();
-	if ($output =~ m/flags: (.*);/) {
-		@flags = split(/ /, $1);
-	}
-
-	my $aware = ($output =~ m/RRSIG/);
-	my $validating = ("ad" ~~ @flags);
-
-	return $aware + $validating;
-}