From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 22 Apr 2015 11:06:52 +0000 (+0200)
Subject: index.cgi: Hide blue and green if not enabled
X-Git-Tag: v2.17-core91~114^2~5
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=db1078ff114c1cd6b8818848660ee72848874836

index.cgi: Hide blue and green if not enabled

Those were shown when a blue or orange interface
was assigned which is not the same as enabled.
---

diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files
index 85d3de3358..7635acfb07 100644
--- a/config/rootfiles/core/90/filelists/files
+++ b/config/rootfiles/core/90/filelists/files
@@ -8,6 +8,7 @@ etc/rc.d/rcsysinit.d/S90network-trigger
 srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/geoip-block.cgi
+srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/html/themes/darkdos/include/style.css
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 53adeacce8..eafbdb1376 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -301,7 +301,7 @@ END
 		print '</td>';
 		print '</tr>';
 	}
-if ( $netsettings{'BLUE_DEV'} ) {
+if (&Header::blue_used()) {
 		my $sub=&General::iporsubtocidr($netsettings{'BLUE_NETMASK'});
 		print <<END;
 		<tr>
@@ -318,7 +318,7 @@ END
 		print '</td>';
 		print '</tr>';
 	}
-if ( $netsettings{'ORANGE_DEV'} ) {
+if (&Header::orange_used()) {
 		my $sub=&General::iporsubtocidr($netsettings{'ORANGE_NETMASK'});
 		print <<END;
 		<tr>