FIREWALL: renamed forwardfw.cgi in firewall.cgi

diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index 2de9e7b08c3810b8597a4ffa6410220acc3d1ccc..8bc66f9121d1be5532d9418c63d7cb02226fde34 100644 (file)
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -1,6 +1,6 @@
     $subfirewall->{'10.forward'} = {
                                'caption' => $Lang::tr{'fwdfw menu'},
-                               'uri' => '/cgi-bin/forwardfw.cgi',
+                               'uri' => '/cgi-bin/firewall.cgi',
                                'title' => "$Lang::tr{'fwdfw menu'}",
                                'enabled' => 1,
                                };

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 8889b67a746bec93b38439660b2209e09fb19e15..a1cd423c505400cde97608efde50f2f60f4e37c4 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1393,7 +1393,7 @@ srv/web/ipfire/cgi-bin/dhcp.cgi
 #srv/web/ipfire/cgi-bin/dmzholes.cgi
 srv/web/ipfire/cgi-bin/extrahd.cgi
 srv/web/ipfire/cgi-bin/fireinfo.cgi
-srv/web/ipfire/cgi-bin/forwardfw.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/gui.cgi
 srv/web/ipfire/cgi-bin/hardwaregraphs.cgi

diff --git a/config/rootfiles/core/fifteen/filelists/firewall b/config/rootfiles/core/fifteen/filelists/firewall
index fc505981cdf9fd56d782a3e77d55dfb7ed5e8c61..c5c0dac6072918ecfa0ec91da84df6e4eaaf846b 100644 (file)
--- a/config/rootfiles/core/fifteen/filelists/firewall
+++ b/config/rootfiles/core/fifteen/filelists/firewall
@@ -1,6 +1,6 @@
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
-srv/web/ipfire/cgi-bin/forwardfw.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/optionsfw.cgi
 srv/web/ipfire/cgi-bin/p2p-block.cgi

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/firewall.cgi
similarity index 100%
rename from html/cgi-bin/forwardfw.cgi
rename to html/cgi-bin/firewall.cgi

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 03ef367465e71140ed02c5fb610bc3de8dabc70b..e37540bc284ff833a30b7d4afd736df9df864ab8 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -341,7 +341,7 @@ END
                }       else { print $Lang::tr{'advproxy off'};  }
        }
        if ( $netsettings{'ORANGE_DEV'} ) { print <<END;
-               <tr><td align='center' bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/forwardfw.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}</b></font></a><br>
+               <tr><td align='center' bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/firewall.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}</b></font></a><br>
                <td width='30%' align='center'>$netsettings{'ORANGE_ADDRESS'}
                <td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
 END