From: Alexander Marx <alexander.marx@ipfire.org>
Date: Tue, 18 Mar 2014 14:02:55 +0000 (+0100)
Subject: Firewall: extend DNAT dropdown with auto,BLUE,ORANGE,GREEN
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=1aa5439cf14c881043dddf685a528fabf33305af

Firewall: extend DNAT dropdown with auto,BLUE,ORANGE,GREEN
---

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 82684e06f..582950b67 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1632,25 +1632,28 @@ END
 						</td>
 END
 
-		if (%aliases) {
-			print <<END;
+	print <<END;
 						<td width='25%' align='right'>$Lang::tr{'dnat address'}:</td>
 						<td width='30%'>
 							<select name='dnat' style='width: 100%;'>
-								<option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'default ip'} ($netsettings{'RED_ADDRESS'})</option>
+								<option value='AUTO' $selected{'dnat'}{'AUTO'}>- $Lang::tr{'automatic'} -</option>
+								<option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'red1'} ($netsettings{'RED_ADDRESS'})</option>
 END
+		if (%aliases) {
 			foreach my $alias (sort keys %aliases) {
 				print "<option value='$alias' $selected{'dnat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
 			}
-
-			print "</select>";
-		} else {
-			print <<END;
-						<td colspan="2" width='55%'>
-							<input type='hidden' name='dnat' value='Default IP'>
-						</td>
-END
 		}
+		#DNAT Dropdown
+		foreach my $network (sort keys %defaultNetworks)
+		{
+			if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$network}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){
+				print "<option value='$defaultNetworks{$network}{'NAME'}'";
+				print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
+				print ">$network ($defaultNetworks{$network}{'NET'})</option>";
+			}
+		}
+		print "</select>";
 		print "</tr>";
 
 		#SNAT
@@ -1671,19 +1674,14 @@ END
 		foreach my $alias (sort keys %aliases) {
 			print "<option value='$alias' $selected{'snat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
 		}
-
-		# XXX this is composed in a very ugly fashion
+		# SNAT Dropdown
 		foreach my $network (sort keys %defaultNetworks) {
-			next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
-			next if($defaultNetworks{$network}{'NAME'} eq "ALL");
-			next if($defaultNetworks{$network}{'NAME'} =~ /OpenVPN/i);
-			next if($defaultNetworks{$network}{'NAME'} =~ /IPsec/i);
-
-			print "<option value='$defaultNetworks{$network}{'NAME'}'";
-			print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
-			print ">$network ($defaultNetworks{$network}{'NET'})</option>";
+			if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$network}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){
+				print "<option value='$defaultNetworks{$network}{'NAME'}'";
+				print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
+				print ">$network ($defaultNetworks{$network}{'NET'})</option>";
+			}
 		}
-
 		print <<END;
 							</select>
 						</td>