Firewall: DNAT - always show right red address in dropdown.

Edited language String in DNAT area: external ip address is now Firewall
Interface
This commit is contained in:
Alexander Marx
2014-03-20 16:23:47 +01:00
committed by Michael Tremer
parent cec275c9df
commit 95cda25924
3 changed files with 5 additions and 3 deletions

View File

@@ -1540,6 +1540,7 @@ sub newrule
$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected';
$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
$selected{'dnat'}{$fwdfwsettings{'dnat'}} ='selected';
}
}
$fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
@@ -1637,7 +1638,7 @@ END
<td width='30%'>
<select name='dnat' style='width: 100%;'>
<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>
<option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'red1'} ($redip)</option>
END
if (%aliases) {
foreach my $alias (sort keys %aliases) {
@@ -2551,6 +2552,7 @@ END
END
#Is this a DNAT rule?
if ($$hash{$key}[31] eq 'dnat' && $$hash{$key}[28] eq 'ON'){
if ($$hash{$key}[29] eq 'Default IP'){$$hash{$key}[29]=$Lang::tr{'red1'};}
print "Firewall ($$hash{$key}[29])";
if($$hash{$key}[30] ne ''){
$$hash{$key}[30]=~ tr/|/,/;

View File

@@ -707,7 +707,7 @@
'dmz pinhole rule added' => 'Regel für DMZ-Schlupfloch hinzugefügt; Starte DMZ-Schlupfloch neu',
'dmz pinhole rule removed' => 'Regel für DMZ-Schlupfloch entfernt; Starte DMZ-Schlupfloch neu',
'dmzpinholes for same net not necessary' => 'DMZ-Schlupflöcher werden im gleichen Netz nicht benötigt. Wählen Sie ein anderes Quell- oder Ziel-Netz.',
'dnat address' => 'Externe IP-Adresse',
'dnat address' => 'Firewall-Interface',
'dns address deleted' => 'Erfolgreich gelöscht! ',
'dns address deleted txt' => 'DNS Server Adressen wurden erfolgreich gelöscht. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.',
'dns address done' => 'Die DNS-Server Adressen Einstellungen werden übernommen.',

View File

@@ -731,7 +731,7 @@
'dmz pinhole rule added' => 'DMZ pinhole rule added; restarting DMZ pinhole',
'dmz pinhole rule removed' => 'DMZ pinhole rule removed; restarting DMZ pinhole',
'dmzpinholes for same net not necessary' => 'DMZ Pinholes are not necessary for same net. Select different source or destination net.',
'dnat address' => 'External IP address',
'dnat address' => 'Firewall Interface',
'dns address deleted' => 'Successfully deleted!',
'dns address deleted txt' => 'The DNS-Server addresses have been successfully deleted.<br />You have to reboot or reconnect that the changes have effect!',
'dns address done' => 'The DNS-Server address settings are going to be saved.',