From: Alexander Marx <amarx@ipfire.org>
Date: Thu, 17 Oct 2013 15:14:19 +0000 (+0200)
Subject: FIREWALL: renamed forwardfw.cgi in firewall.cgi
X-Git-Tag: v2.15-beta1~187
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b161bfa8683402036e0d3e08159aafda5d4c4310;p=people%2Fms%2Fipfire-2.x.git

FIREWALL: renamed forwardfw.cgi in firewall.cgi
---

diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index 2de9e7b08c..8bc66f9121 100644
--- 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 8889b67a74..a1cd423c50 100644
--- 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 fc505981cd..c5c0dac607 100644
--- 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 03ef367465..e37540bc28 100644
--- 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