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

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index db53a382ce4cad3843b8f5c280c0521452ef8a01..73e817bbc8adc497409d37b46a009a8e2a6eb3fb 100755 (executable)
--- 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;