From: Alexander Marx <amarx@ipfire.org>
Date: Tue, 14 Jan 2014 13:11:50 +0000 (+0100)
Subject: firewall: perl modifications for hiding rule action when nat is used
X-Git-Tag: v2.15-beta2~93^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e7137264bdfae87367a7414d07a054eb7c58c7c;p=ipfire-2.x.git

firewall: perl modifications for hiding rule action when nat is used
---

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 7ffe59c6f4..51966700e4 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -726,6 +726,9 @@ sub checkrule
 {
 	#check valid port for NAT
 	if($fwdfwsettings{'USE_NAT'} eq 'ON'){
+		#RULE_ACTION must be on if we use NAT
+		$fwdfwsettings{'RULE_ACTION'} = 'ACCEPT';
+
 		#if no dest port is given in nat area, take target host port
 		if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$fwdfwsettings{'TGT_PORT'};}
 		if($fwdfwsettings{'TGT_PORT'} eq '' && $fwdfwsettings{'dnatport'} ne '' && ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP')){
@@ -1847,7 +1850,7 @@ END
 		print <<END;
 			<br>
 			<center>
-				<table width="80%" class='tbl'>
+				<table width="80%" class='tbl' id='actions'>
 					<tr>
 						<td width="33%" align="center" bgcolor="$color{'color17'}">
 							&nbsp;<br>&nbsp;