X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Ffirewall.cgi;h=8b02b04467546a8ea728dd772f4b9d929c782dfd;hp=71ca752574f56f8448ea33c5c94df6c38781d816;hb=f4d5310decf8cd8f16d92bfe0457cc8fb87fc663;hpb=3c037075d0f6c296225500651d89b03b3c65d9e2

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 71ca75257..8b02b0446 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -158,11 +158,6 @@ print<<END;
 		// dropdown menu changes.
 		\$("select").change(function() {
 			var id = \$(this).attr("name");
-
-			// When using SNAT or DNAT, check "USE NAT" Checkbox
-			if (id === 'snat' || id === 'dnat') {
-				\$('#USE_NAT').prop('checked', true);
-			}
 			\$('#' + id).prop("checked", true);
 		});
 	});
@@ -731,7 +726,7 @@ sub checkrule
 	if($fwdfwsettings{'USE_NAT'} eq 'ON'){
 		#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 ''){
+		if($fwdfwsettings{'TGT_PORT'} eq '' && $fwdfwsettings{'dnatport'} ne '' && ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP')){
 			$errormessage=$Lang::tr{'fwdfw dnat porterr2'};
 		}
 		#check if port given in nat area is a single valid port or portrange
@@ -1431,6 +1426,11 @@ sub newrule
 	open (CONN1,"/var/ipfire/red/local-ipaddress");
 	my $redip = <CONN1>;
 	close(CONN1);
+	if (! $fwdfwsettings{'RULE_ACTION'} && $fwdfwsettings{'POLICY'} eq 'MODE2'){
+		$fwdfwsettings{'RULE_ACTION'}='DROP';
+	}elsif(! $fwdfwsettings{'RULE_ACTION'} && $fwdfwsettings{'POLICY'} eq 'MODE1'){
+		$fwdfwsettings{'RULE_ACTION'}='ACCEPT';
+	}
 	$checked{'grp1'}{$fwdfwsettings{'grp1'}} 				= 'CHECKED';
 	$checked{'grp2'}{$fwdfwsettings{'grp2'}} 				= 'CHECKED';
 	$checked{'grp3'}{$fwdfwsettings{'grp3'}} 				= 'CHECKED';
@@ -1447,6 +1447,7 @@ sub newrule
 	$checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} 		= 'CHECKED';
 	$checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} 		= 'CHECKED';
 	$checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} 			= 'CHECKED';
+	$checked{'nat'}{$fwdfwsettings{'nat'}} 		= 'CHECKED';
 	$selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}}		= 'selected';
 	$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}			= 'selected';
 	$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
@@ -1552,6 +1553,11 @@ sub newrule
 			}
 		}	
 	}
+	# Split manual source and target address and delete the subnet
+	my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
+	if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;}
+	my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}});
+	if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
 	&Header::openbox('100%', 'left', $Lang::tr{'fwdfw addrule'});
 	&Header::closebox();
 	&Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});
@@ -1594,7 +1600,7 @@ END
 						<td width='5%'></td>
 						<td width='40%'>
 							<label>
-								<input type='radio' name='nat' id='dnat' value='dnat' checked>
+								<input type='radio' name='nat'  value='dnat' $checked{'nat'}{'dnat'}>
 								$Lang::tr{'fwdfw dnat'}
 							</label>
 						</td>
@@ -1627,7 +1633,7 @@ END
 						<td width='5%'></td>
 						<td width='40%'>
 							<label>
-								<input type='radio' name='nat' id='snat' value='snat' $checked{'nat'}{'snat'}>
+								<input type='radio' name='nat'  value='snat' $checked{'nat'}{'snat'}>
 								$Lang::tr{'fwdfw snat'}
 							</label>
 						</td>
@@ -1837,23 +1843,9 @@ END
 END
 
 		&Header::closebox;
-
-		$checked{"RULE_ACTION"} = ();
-		foreach ("ACCEPT", "DROP", "REJECT") {
-			$checked{"RULE_ACTION"}{$_} = "";
-		}
-
-		if($fwdfwsettings{'updatefwrule'} eq 'on') {
-			$checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}} = "checked";
-		} elsif ($fwdfwsettings{'POLICY'} eq 'MODE1') {
-			$checked{"RULE_ACTION"}{"ACCEPT"} = "checked";
-		} elsif ($fwdfwsettings{'POLICY'} eq 'MODE2') {
-			$checked{"RULE_ACTION"}{"DROP"} = "checked";
-		}
-
+		$checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}}	= 'CHECKED';
 		print <<END;
 			<hr><br>
-
 			<center>
 				<table width="80%" border="0">
 					<tr>
@@ -2031,6 +2023,7 @@ END
 			<input type='hidden' name='oldorange' value='$fwdfwsettings{'oldorange'}' />
 			<input type='hidden' name='oldnat' value='$fwdfwsettings{'oldnat'}' />
 			<input type='hidden' name='oldruletype' value='$fwdfwsettings{'oldruletype'}' />
+			<input type='hidden' name='nat' value='$fwdfwsettings{'nat'}' />
 			<input type='hidden' name='ACTION' value='saverule' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value'reset'></td></td>
 			</table></form>
 END