Forward Firewall: reordered Firewall Menu and changed header.pl to reflect the new...

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index a7f209d9cbaed7c7ef485b0f2cd74c2ad6978d21..e0f18df153521a87e6c431321c69ed241de7f84a 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -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;

diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index f8f8098338a296905c4a56f9d8609103963442d5..cc50bf655d836e5e32d47b1c94b91227b6713a3a 100644 (file)
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -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',