Merge remote-tracking branch 'mfischer/libnet' into next

[people/pmueller/ipfire-2.x.git] / config / menu / 50-firewall.menu

diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index 90baa65b2f9ce59686b034848241083cf1771350..7271b3212124c04a9d858c6a05d934ab3169bde6 100644 (file)
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -1,39 +1,45 @@
-    $subfirewall->{'10.dnat'} = {
-                                'caption' => $Lang::tr{'ssport forwarding'},
-                                'uri' => '/cgi-bin/portfw.cgi',
-                                'title' => "$Lang::tr{'ssport forwarding'}",
-                                '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->{'51.forward'} = {
-                               'caption' => $Lang::tr{'fwdfw menu'},
-                               'uri' => '/cgi-bin/forwardfw.cgi',
-                               'title' => "$Lang::tr{'fwdfw menu'}",
-                               'enabled' => 1,
-                               };                      
-       $subfirewall->{'65.fwhost'} = {
+                               };
+       $subfirewall->{'20.fwhost'} = {
                                'caption' => $Lang::tr{'fwhost menu'},
                                'uri' => '/cgi-bin/fwhosts.cgi',
                                'title' => "$Lang::tr{'fwhost menu'}",
                                'enabled' => 1,
                                };
-       $subfirewall->{'70.upnp'} = {
-                               'caption' => 'UPnP',
-                               'uri' => '/cgi-bin/upnp.cgi',
-                               'title' => "Universal Plug and Play",
-                               'enabled' => 0,
-                               };
-       $subfirewall->{'80.optingsfw'} = {
+    $subfirewall->{'30.optionsfw'} = {
                                'caption' => $Lang::tr{'options fw'},
                                'uri' => '/cgi-bin/optionsfw.cgi',
                                'title' => "$Lang::tr{'options fw'}",
                                'enabled' => 1,
                                };
+       $subfirewall->{'40.p2p'} = {
+                               'caption' => $Lang::tr{'p2p block'},
+                               'uri' => '/cgi-bin/p2p-block.cgi',
+                               'title' => "P2P-Block",
+                               'enabled' => 1,
+                               };
+    $subfirewall->{'50.geoipblock'} = {
+                               'caption' => $Lang::tr{'geoipblock'},
+                               'uri' => '/cgi-bin/geoip-block.cgi',
+                               'title' => $Lang::tr{'geoipblock'},
+                               '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->{'90.iptables'} = {
                                'caption' => $Lang::tr{'ipts'},
                                'uri' => '/cgi-bin/iptables.cgi',