X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config%2Fmenu%2F50-firewall.menu;h=e872e6428c1d68395e974b6b596eebc7e6e8af48;hb=e0f8464866f71590e7f5c9a43a59a60e633a6c8f;hp=d8a4908f624dabdadb9a2d51d7ebba7322a15280;hpb=149097bdcab26c8a53b419ea596c9ab77d0eb226;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index d8a4908f62..e872e6428c 100644
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -1,46 +1,40 @@
-    $subfirewall->{'10.dnat'} = {
-				 'caption' => $Lang::tr{'ssport forwarding'},
-				 'uri' => '/cgi-bin/portfw.cgi',
-				 'title' => "$Lang::tr{'ssport forwarding'}",
-				 'enabled' => 1,
-				 };
-    $subfirewall->{'20.xtaccess'} = {
-				 'caption' => $Lang::tr{'external access'},
-				 'uri' => '/cgi-bin/xtaccess.cgi',
-				 'title' => "$Lang::tr{'external access'}",
-				 'enabled' => 1,
-				 };
-    $subfirewall->{'30.wireless'} = {
-				'caption' => $Lang::tr{'blue access'},
-				'uri' => '/cgi-bin/wireless.cgi',
-				'title' => "$Lang::tr{'blue access'}",
+    $subfirewall->{'10.firewall'} = {
+				'caption' => $Lang::tr{'firewall rules'},
+				'uri' => '/cgi-bin/firewall.cgi',
+				'title' => "$Lang::tr{'firewall rules'}",
+				'enabled' => 1,
+				};
+	$subfirewall->{'20.fwhost'} = {
+				'caption' => $Lang::tr{'fwhost menu'},
+				'uri' => '/cgi-bin/fwhosts.cgi',
+				'title' => "$Lang::tr{'fwhost menu'}",
 				'enabled' => 1,
-				 };
-    $subfirewall->{'40.dmz'} = {
-				'caption' => $Lang::tr{'ssdmz pinholes'},
-				'uri' => '/cgi-bin/dmzholes.cgi',
-				'title' => "$Lang::tr{'dmz pinhole configuration'}",
+				};
+    $subfirewall->{'30.optionsfw'} = {
+				'caption' => $Lang::tr{'options fw'},
+				'uri' => '/cgi-bin/optionsfw.cgi',
+				'title' => "$Lang::tr{'options fw'}",
 				'enabled' => 1,
-				 };
-    $subfirewall->{'50.outgoing'} = {
-				'caption' => $Lang::tr{'outgoing firewall'},
-				'uri' => '/cgi-bin/outgoingfw.cgi',
-				'title' => "$Lang::tr{'outgoing firewall'}",
+				};
+	$subfirewall->{'40.p2p'} = {
+				'caption' => $Lang::tr{'p2p block'},
+				'uri' => '/cgi-bin/p2p-block.cgi',
+				'title' => "P2P-Block",
 				'enabled' => 1,
 				};
-    $subfirewall->{'60.upnp'} = {
+    $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',
 				'title' => "Universal Plug and Play",
 				'enabled' => 0,
 				};
-    $subfirewall->{'60.optingsfw'} = {
-				'caption' => $Lang::tr{'options fw'},
-				'uri' => '/cgi-bin/optionsfw.cgi',
-				'title' => "$Lang::tr{'options fw'}",
-				'enabled' => 1,
-				};
-    $subfirewall->{'70.iptables'} = {
+	$subfirewall->{'90.iptables'} = {
 				'caption' => $Lang::tr{'ipts'},
 				'uri' => '/cgi-bin/iptables.cgi',
 				'title' => "$Lang::tr{'ipts'}",