From: Alexander Marx <amarx@ipfire.org>
Date: Thu, 21 Nov 2013 06:43:53 +0000 (+0100)
Subject: Firewall: Bugfix: Last rule for outgoing showed wrong color, Bugfix:When using a... 
X-Git-Tag: v2.15-beta1~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35ca8e0203c4d94178f2186d0c0b73f8ec48bc50;p=people%2Fms%2Fipfire-2.x.git

Firewall: Bugfix: Last rule for outgoing showed wrong color, Bugfix:When using a rule with sourceport and afterwards editing this rule to use service or servicegroup, there was an errormessage.
---

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index d1c086d5c7..d2aa2172ee 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -855,12 +855,7 @@ sub checkrule
 			}
 		}
 	}
-	#When using source- or targetport, the protocol has to be TCP or UDP
-	if (($fwdfwsettings{'USESRV'} eq 'ON' || $fwdfwsettings{'USE_SRC_PORT'} eq 'ON') && ($fwdfwsettings{'SRC_PORT'} ne '' || $fwdfwsettings{'TGT_PORT'} ne '') && ($fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP')){
-		$errormessage.=$Lang::tr{'fwdfw err prot_port1'};
-		return;
-	}
-	#when icmp selected, no targetport allowed
+	#when icmp selected, no source and targetport allowed
 	if (($fwdfwsettings{'PROT'} ne '' && $fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP' && $fwdfwsettings{'PROT'} ne 'template') && ($fwdfwsettings{'USESRV'} eq 'ON' || $fwdfwsettings{'USE_SRC_PORT'} eq 'ON')){
 		$errormessage.=$Lang::tr{'fwdfw err prot_port'};
 		return;
@@ -930,9 +925,10 @@ sub checkrule
 		$fwdfwsettings{'ICMP_TYPES'}='';
 		$fwdfwsettings{'USESRV'}='';
 		$fwdfwsettings{'TGT_PORT'}='';
-	}elsif($fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP' && $fwdfwsettings{'PROT'} ne 'ICMP'){
+	}elsif($fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP'){
 		$fwdfwsettings{'ICMP_TYPES'}='';
-		$fwdfwsettings{'PROT'} = '';
+		$fwdfwsettings{'SRC_PORT'}='';
+		$fwdfwsettings{'TGT_PORT'}='';
 	}elsif($fwdfwsettings{'PROT'} ne 'ICMP'){
 		$fwdfwsettings{'ICMP_TYPES'}='';
 	}
@@ -2882,9 +2878,9 @@ END
 
 		$message = $Lang::tr{'fwdfw pol allow'};
 
-	} elsif ($config eq '/var/ipfire/firewall/outgoing') {
+	} elsif ($config eq '/var/ipfire/firewall/outgoing' && ($fwdfwsettings{'POLICY1'} ne 'MODE1')) {
 		$message = $Lang::tr{'fwdfw pol allow'};
-
+		$colour = "bgcolor='green'";
 	} else {
 		$message = $Lang::tr{'fwdfw pol block'};
 		$colour = "bgcolor='darkred'";