From: Alexander Marx <amarx@ipfire.org>
Date: Wed, 30 Oct 2013 14:49:21 +0000 (+0100)
Subject: Firewall: added IP-Address to dropdown in DNAT part and now all ip-addresses are... 
X-Git-Tag: v2.15-beta1~167^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11ab2c7d9a5b91cbc3092defe1a32572acd0ba6d;p=ipfire-2.x.git

Firewall: added IP-Address to dropdown in DNAT part and now all ip-addresses are in brackets
---

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index db53a382ce..73e817bbc8 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1685,10 +1685,10 @@ 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'}</option>
+								<option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'default ip'} ($netsettings{'RED_ADDRESS'})</option>
 END
 			foreach my $alias (sort keys %aliases) {
-				print "<option value='$alias' $selected{'dnat'}{$alias}>$alias</option>";
+				print "<option value='$alias' $selected{'dnat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
 			}
 
 			print "</select>";
@@ -1717,7 +1717,7 @@ END
 END
 
 		foreach my $alias (sort keys %aliases) {
-			print "<option value='$alias' $selected{'snat'}{$alias}>$alias $aliases{$alias}{'IPT'}</option>";
+			print "<option value='$alias' $selected{'snat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
 		}
 
 		# XXX this is composed in a very ugly fashion
@@ -1729,7 +1729,7 @@ END
 
 			print "<option value='$defaultNetworks{$network}{'NAME'}'";
 			print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
-			print ">$network $defaultNetworks{$network}{'NET'}</option>";
+			print ">$network ($defaultNetworks{$network}{'NET'})</option>";
 		}
 
 		print <<END;