From a615cab30e57f39cc891d75a195e1df4bf4e21f3 Mon Sep 17 00:00:00 2001
From: Alexander Marx <amarx@ipfire.org>
Date: Thu, 28 Feb 2013 07:30:24 +0100
Subject: [PATCH] Forward Firewall: reordered Firewall Menu and changed
 header.pl to reflect the new menuposition for Blue Access

---
 config/cfgroot/header.pl     |  5 +----
 config/menu/50-firewall.menu | 14 +++++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index a7f209d9cb..e0f18df153 100644
--- 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 f8f8098338..cc50bf655d 100644
--- 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',
-- 
2.39.2