Forward Firewall: reordered Firewall Menu and changed header.pl to reflect the new menuposition for Blue Access

This commit is contained in:
Alexander Marx
2013-02-28 07:30:24 +01:00
committed by Michael Tremer
parent d998784149
commit a615cab30e
2 changed files with 8 additions and 11 deletions

View File

@@ -148,11 +148,8 @@ sub genmenu {
eval `/bin/cat /var/ipfire/menu.d/*.menu`;
eval `/bin/cat /var/ipfire/menu.d/*.main`;
if (! blue_used() && ! orange_used()) {
$menu->{'05.firewall'}{'subMenu'}->{'40.dmz'}{'enabled'} = 0;
}
if (! blue_used()) {
$menu->{'05.firewall'}{'subMenu'}->{'30.wireless'}{'enabled'} = 0;
$menu->{'05.firewall'}{'subMenu'}->{'60.wireless'}{'enabled'} = 0;
}
if ( $ethsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $ethsettings{'RED_TYPE'} eq 'STATIC' ) {
$menu->{'03.network'}{'subMenu'}->{'70.aliases'}{'enabled'} = 1;

View File

@@ -10,18 +10,12 @@
'title' => "$Lang::tr{'fwhost menu'}",
'enabled' => 1,
};
$subfirewall->{'29.optionsfw'} = {
$subfirewall->{'30.optionsfw'} = {
'caption' => $Lang::tr{'options fw'},
'uri' => '/cgi-bin/optionsfw.cgi',
'title' => "$Lang::tr{'options fw'}",
'enabled' => 1,
};
$subfirewall->{'30.wireless'} = {
'caption' => $Lang::tr{'blue access'},
'uri' => '/cgi-bin/wireless.cgi',
'title' => "$Lang::tr{'blue access'}",
'enabled' => 1,
};
$subfirewall->{'40.p2p'} = {
'caption' => 'P2P-Block',
'uri' => '/cgi-bin/p2p-block.cgi',
@@ -34,6 +28,12 @@
'title' => "$Lang::tr{'ssport forwarding'}",
'enabled' => 1,
};
$subfirewall->{'60.wireless'} = {
'caption' => $Lang::tr{'blue access'},
'uri' => '/cgi-bin/wireless.cgi',
'title' => "$Lang::tr{'blue access'}",
'enabled' => 1,
};
$subfirewall->{'70.upnp'} = {
'caption' => 'UPnP',
'uri' => '/cgi-bin/upnp.cgi',