This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 334620ee2bf24a4d80303b766f91bc64178c4042 (commit) via db1078ff114c1cd6b8818848660ee72848874836 (commit) from 0fa8d28e8fe5f6a9a04b8d13b4dc6bb6b1f54c8f (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 334620ee2bf24a4d80303b766f91bc64178c4042 Merge: db1078f 0fa8d28 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 22 13:07:30 2015 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit db1078ff114c1cd6b8818848660ee72848874836 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 22 13:06:52 2015 +0200

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.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/90/filelists/files | 1 + html/cgi-bin/index.cgi | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files index 85d3de3..7635acf 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 53adeac..eafbdb1 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>

hooks/post-receive -- IPFire 2.x development tree