X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=c142a65f7f19b26338b5ad08a6b7277aa27b8d35;hb=949c20d97f6b348701515049b042eff326ae4017;hp=53adeacce8c9d852a99fc79629157eb53531b0a7;hpb=dd29d563a603b0bc182af23efd5160caf75657c4;p=ipfire-2.x.git diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 53adeacce8..c142a65f7f 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -200,26 +200,20 @@ END END } - my @dns_servers = (); - foreach my $f ("${General::swroot}/red/dns1", "${General::swroot}/red/dns2") { - open(DNS, "<$f"); - my $dns_server = ; - close(DNS); - - chomp($dns_server); - if ($dns_server) { - push(@dns_servers, $dns_server); - } + my $dns_servers; + if ( -e "${General::swroot}/red/dns" ) { + open (TMP, "<${General::swroot}/red/dns"); + $dns_servers = ; + chomp($dns_servers); + close TMP; } - my $dns_servers_str = join(", ", @dns_servers); - print < $Lang::tr{'dns servers'}: - $dns_servers_str + $dns_servers @@ -301,7 +295,7 @@ END print ''; print ''; } -if ( $netsettings{'BLUE_DEV'} ) { +if (&Header::blue_used()) { my $sub=&General::iporsubtocidr($netsettings{'BLUE_NETMASK'}); print < @@ -318,7 +312,7 @@ END print ''; print ''; } -if ( $netsettings{'ORANGE_DEV'} ) { +if (&Header::orange_used()) { my $sub=&General::iporsubtocidr($netsettings{'ORANGE_NETMASK'}); print <