From: Alexander Marx <alexander.marx@ipfire.org>
Date: Wed, 5 Mar 2014 07:13:04 +0000 (+0100)
Subject: Firewall: Remarkcheck should now support old firewallrules from converter
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=65c9b3a50815587bc212160465c92b6150e6fb77

Firewall: Remarkcheck should now support old firewallrules from converter
---

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index d9f9e0f8a..e633b3c5c 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -2141,6 +2141,7 @@ sub saverule
 			&changerule($configfwdfw);
 			#print"6";
 		}
+		$fwdfwsettings{'ruleremark'}=~ s/,/;/g;
 		$fwdfwsettings{'ruleremark'}=&Header::escape($fwdfwsettings{'ruleremark'});
 		if ($fwdfwsettings{'updatefwrule'} ne 'on'){
 			my $key = &General::findhasharraykey ($hash);
@@ -2278,7 +2279,6 @@ sub validremark
 {
 	# Checks a hostname against RFC1035
 	my $remark = $_[0];
-	$remark =~ s/,/;/g;
 	if ($remark =~ /^[[:print:]]*$/) {
 		return 1;
 	}