From: Alexander Marx <amarx@ipfire.org>
Date: Fri, 18 Jan 2013 09:18:25 +0000 (+0100)
Subject: Forward Firewall: Bugfix: when editing an rule, the default ACTION (ACCEPT,DROP,REJEC... 
X-Git-Tag: v2.15-beta1~286^2~11^2~248
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf576a12e54b51f563dccc77b783fce7de6b5768;p=ipfire-2.x.git

Forward Firewall: Bugfix: when editing an rule, the default ACTION (ACCEPT,DROP,REJECT) was set depending on Firewallmode. Now it checks, if a rule is edited and value is set to rule action
---

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 8fae77123c..b2976e1c35 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -1014,15 +1014,21 @@ print <<END;
 END
 	foreach ("ACCEPT","DROP","REJECT")
 	{
-		if($fwdfwsettings{'POLICY'} eq 'MODE2'){
-			$fwdfwsettings{'RULE_ACTION'} = 'DROP';
-		}
-
-		if ($_ eq $fwdfwsettings{'RULE_ACTION'})
-		{
-			print"<option selected>$_</option>";
+		if($fwdfwsettings{'updatefwrule'} eq 'on'){
+			print"<option ";
+			print "selected='selected'" if ($fwdfwsettings{'RULE_ACTION'} eq $_);
+			print">$_</option>";
 		}else{
-			print"<option>$_</option>";
+			if($fwdfwsettings{'POLICY'} eq 'MODE2'){
+				$fwdfwsettings{'RULE_ACTION'} = 'DROP';
+			}
+	
+			if ($_ eq $fwdfwsettings{'RULE_ACTION'})
+			{
+				print"<option selected>$_</option>";
+			}else{
+				print"<option>$_</option>";
+			}
 		}
 	}
 	print"</select></td></tr></table><hr>";