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

This commit is contained in:
Alexander Marx
2014-03-18 15:02:55 +01:00
committed by Michael Tremer
parent bb0618287b
commit 1aa5439cf1

View File

@@ -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>