From: Alexander Marx <alexander.marx@ipfire.org>
Date: Tue, 4 Mar 2014 15:00:14 +0000 (+0100)
Subject: Firewall: Now it is possible to just change the remark in input and outgoing
X-Git-Tag: v2.15-rc1~52^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c3bcb9f00fc09c86312b382bfb594c08fabc9ed;p=people%2Fms%2Fipfire-2.x.git

Firewall: Now it is possible to just change the remark in input and outgoing
---

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 52bac58bed..dfb9697387 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -223,6 +223,9 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
 						if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
 							$errormessage=$Lang::tr{'fwdfw err remark'}."<br>";
 						}
+						if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){
+							$errormessage='';
+						}
 						if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){
 							$fwdfwsettings{'nosave'} = 'on';
 						}
@@ -264,6 +267,9 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
 						if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
 							$errormessage=$Lang::tr{'fwdfw err remark'}."<br>";
 						}
+						if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){
+							$errormessage='';
+						}
 						if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){
 							$fwdfwsettings{'nosave'} = 'on';
 						}