X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fmenu%2F50-firewall.menu;h=ce6fd9d8de82454458e62353d2830987929ae9c5;hp=02b9045f221932f1806a5cf5bc70b6de88ef49bb;hb=f536ab266173dd7d6ec5ddd984e0a458c1aedbc2;hpb=5595bc0381fe971b538ddd0b7cf3bf4a9f31832c

diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index 02b9045f2..ce6fd9d8d 100644
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -1,42 +1,42 @@
-    $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.forward'} = {
+				'caption' => $Lang::tr{'fwdfw menu'},
+				'uri' => '/cgi-bin/firewall.cgi',
+				'title' => "$Lang::tr{'fwdfw menu'}",
 				'enabled' => 1,
-				 };
-    $subfirewall->{'40.dmz'} = {
-				'caption' => $Lang::tr{'ssdmz pinholes'},
-				'uri' => '/cgi-bin/dmzholes.cgi',
-				'title' => "$Lang::tr{'dmz pinhole configuration'}",
+				};
+	$subfirewall->{'20.fwhost'} = {
+				'caption' => $Lang::tr{'fwhost menu'},
+				'uri' => '/cgi-bin/fwhosts.cgi',
+				'title' => "$Lang::tr{'fwhost menu'}",
 				'enabled' => 1,
-				 };
-    $subfirewall->{'50.outgoing'} = {
-				'caption' => $Lang::tr{'outgoing firewall'},
-				'uri' => '/cgi-bin/outgoingfw.cgi',
-				'title' => "$Lang::tr{'outgoing firewall'}",
+				};
+    $subfirewall->{'30.optionsfw'} = {
+				'caption' => $Lang::tr{'options fw'},
+				'uri' => '/cgi-bin/optionsfw.cgi',
+				'title' => "$Lang::tr{'options fw'}",
 				'enabled' => 1,
 				};
-    $subfirewall->{'60.upnp'} = {
+	$subfirewall->{'40.p2p'} = {
+				'caption' => $Lang::tr{'p2p block'},
+				'uri' => '/cgi-bin/p2p-block.cgi',
+				'title' => "P2P-Block",
+				'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',
 				'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'}",
+	$subfirewall->{'90.iptables'} = {
+				'caption' => $Lang::tr{'ipts'},
+				'uri' => '/cgi-bin/iptables.cgi',
+				'title' => "$Lang::tr{'ipts'}",
 				'enabled' => 1,
 				};