X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Ffirewall.cgi;h=ceaab566b539a481c8a516ae0729fc650de75fa7;hb=d00b3548852f478a566ffa6dc9dc4b89e86c58a3;hp=71ca752574f56f8448ea33c5c94df6c38781d816;hpb=03f02bcd20f9e5c1cb0743bfe88ba02c6ad01dac;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 71ca75257..ceaab566b 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);
 		});
 	});
@@ -664,6 +659,8 @@ sub checktarget
 							if (&General::validport($_)){
 								push (@values,$_);
 							}else{
+								$errormessage=$Lang::tr{'fwdfw err tgt_port'};
+								return $errormessage;
 							}
 						}
 					}
@@ -731,7 +728,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
@@ -1354,6 +1351,7 @@ sub getcolor
 			#Check if IP is part of a IPsec N2N network
 			foreach my $key (sort keys %ipsecconf){
 				my ($a,$b) = split("/",$ipsecconf{$key}[11]);
+				$b=&General::iporsubtodec($b);
 				if (&General::IpInSubnet($c,$a,$b)){
 					$tdcolor="style='background-color: $Header::colourvpn;color:white;'";
 					return;
@@ -1431,6 +1429,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 +1450,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,8 +1556,11 @@ sub newrule
 			}
 		}	
 	}
-	&Header::openbox('100%', 'left', $Lang::tr{'fwdfw addrule'});
-	&Header::closebox();
+	# 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 source'});
 	#------SOURCE-------------------------------------------------------
 	print "<form method='post'>";
@@ -1575,10 +1582,10 @@ END
 		}
 		print<<END;
 		</select></td></tr>
-		<tr><td colspan='8'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
+		<tr><td><br></td></tr>
+		</table>
 END
 		&gen_dd_block('src','grp1');
-		print"<hr>";
 		&Header::closebox();
 
 		#---SNAT / DNAT ------------------------------------------------
@@ -1594,7 +1601,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 +1634,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>
@@ -1681,10 +1688,9 @@ END
 		}
 		print<<END;
 		</select></td></tr>
-		<tr><td colspan='7'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
+		<tr><td><br></td></tr></table>
 END
 		&gen_dd_block('tgt','grp2');
-		print"<hr>";
 		&Header::closebox;
 		#---PROTOCOL------------------------------------------------------
 		$fwdfwsettings{'SRC_PORT'} =~ s/\|/,/g;
@@ -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>
-
+			<br>
 			<center>
 				<table width="80%" border="0">
 					<tr>
@@ -2000,7 +1992,7 @@ END
 				</td>
 			</tr>
 		</table>
-		<br><hr>
+		<br>
 END
 
 		#---ACTION------------------------------------------------------
@@ -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
@@ -2307,7 +2300,7 @@ sub viewtablenew
 	&General::readhasharray("$configccdhost", \%ccdhost);
 
 	&Header::openbox('100%', 'left', $title);
-	print "<table width='100%' cellspacing='0' border='0'>";
+	print "<table width='100%' cellspacing='0' class='tbl'>";
 
 	if (! -z $config) {
 		my $count=0;