Firewall: Bug10513

This commit is contained in:
Alexander Marx
2014-04-17 11:14:25 +02:00
committed by Michael Tremer
parent 4fbf276cae
commit bc595f0985
3 changed files with 19 additions and 7 deletions

View File

@@ -909,9 +909,6 @@ if ($fwhostsettings{'ACTION'} eq 'deletegrphost')
}
&General::writehasharray("$configgrp", \%customgrp);
&General::firewall_config_changed();
if ($fwhostsettings{'grpcnt'} > 0){
&General::firewall_config_changed();
}
if ($fwhostsettings{'update'} eq 'on'){
$fwhostsettings{'remark'}= $grpremark;
$fwhostsettings{'grp_name'}=$grpname;
@@ -1843,11 +1840,11 @@ sub viewtablegrp
print "$customgrp{$key}[2]</td>";
}
if ($ip eq '' && $customgrp{$key}[2] ne $Lang::tr{'fwhost err emptytable'}){
print "<td align='center' $col>$Lang::tr{'fwhost deleted'}</td><td align='center' $col>$customgrp{$key}[3]</td><td width='1%' $col><form method='post'>";
print "<td align='center' $col>$Lang::tr{'fwhost deleted'}</td><td align='center' $col>$Lang::tr{'fwhost '.$customgrp{$key}[3]}</td><td width='1%' $col><form method='post'>";
}else{
my ($colip,$colsub) = split("/",$ip);
$ip="$colip/".&General::iporsubtocidr($colsub) if ($colsub);
print"<td align='center' $col>".&getcolor($ip)."</td><td align='center' $col>$customgrp{$key}[3]</td><td width='1%' $col><form method='post'>";
print"<td align='center' $col>".&getcolor($ip)."</td><td align='center' $col>$Lang::tr{'fwhost '.$customgrp{$key}[3]}</td><td width='1%' $col><form method='post'>";
}
if ($delflag > 0 && $ip ne ''){
print"<input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' />";
@@ -1858,8 +1855,7 @@ sub viewtablegrp
}
}
}
print"<input type='hidden' name='ACTION' value='deletegrphost'><input type='hidden' name='grpcnt' value='$customgrp{$key}[4]'><input type='hidden' name='update' value='$fwhostsettings{'update'}'><input type='hidden' name='delhost' value='$grpname,$remark,$customgrp{$key}[2],$customgrp{$key}[3]'></form></td></tr>";
print"<input type='hidden' name='ACTION' value='deletegrphost'><input type='hidden' name='update' value='$fwhostsettings{'update'}'><input type='hidden' name='delhost' value='$grpname,$remark,$customgrp{$key}[2],$customgrp{$key}[3]'></form></td></tr>";
$helper=$customgrp{$key}[0];
$number++;
}

View File

@@ -1046,9 +1046,11 @@
'fwhost changeremark' => 'Es wurde nur die Bemerkung angepasst.',
'fwhost cust addr' => 'Hosts',
'fwhost cust grp' => 'Gruppen',
'fwhost Custom Host' => 'Host',
'fwhost cust net' => 'Netzwerke',
'fwhost cust service' => 'Dienste',
'fwhost cust srvgrp' => 'Dienstgruppen',
'fwhost Custom Network' => 'Netzwerk',
'fwhost deleted' => 'Gelöscht',
'fwhost empty' => 'Keine Regeln definiert',
'fwhost err addr' => 'IP-Adresse oder Subnetzmaske ungültig',
@@ -1088,7 +1090,9 @@
'fwhost ip_mac' => 'IP/MAC-Adresse',
'fwhost ipadr' => 'IP-Adresse:',
'fwhost ipsec host' => 'IPsec-Clients:',
'fwhost IpSec Host' => 'IPsec-Host',
'fwhost ipsec net' => 'IPsec-Netzwerke:',
'fwhost IpSec Network' => 'IPsec-Netzwerk',
'fwhost menu' => 'Firewallgruppen',
'fwhost netaddress' => 'Netzwerkadresse',
'fwhost newgrp' => 'Netzwerk-/Hostgruppen',
@@ -1097,6 +1101,9 @@
'fwhost newservice' => 'Dienst',
'fwhost newservicegrp' => 'Dienstgruppen',
'fwhost orange' => 'Orange',
'fwhost OpenVPN static host' => 'OpenVPN statischer Host',
'fwhost OpenVPN static network' => 'OpenVPN statisches Netzwerk',
'fwhost OpenVPN N-2-N' => 'OpenVPN Netz-zu-Netz',
'fwhost ovpn_n2n' => 'OpenVPN Net-to-Net',
'fwhost port' => 'Port(s)',
'fwhost prot' => 'Protokoll',
@@ -1105,6 +1112,7 @@
'fwhost services' => 'Dienste',
'fwhost srv_name' => 'Dienstname',
'fwhost stdnet' => 'Standard-Netzwerke:',
'fwhost Standard Network' => 'Standard-Netzwerk',
'fwhost type' => 'Typ',
'fwhost used' => 'Genutzt',
'fwhost welcome' => 'Hier können einzelne Hosts, Netzwerke oder Dienste zu Gruppen zusammengefasst werden, was das erstellen von Firewallregeln einfacher und schneller macht.',

View File

@@ -1072,9 +1072,11 @@
'fwhost changeremark' => 'You modified just the remark',
'fwhost cust addr' => 'Hosts',
'fwhost cust grp' => 'Network/Host Groups',
'fwhost Custom Host' => 'Host',
'fwhost cust net' => 'Networks',
'fwhost cust service' => 'Services',
'fwhost cust srvgrp' => 'Service Groups',
'fwhost Custom Network' => 'Network',
'fwhost deleted' => 'Deleted',
'fwhost empty' => 'No rules defined',
'fwhost err addr' => 'Invalid IP address or subnet',
@@ -1114,7 +1116,9 @@
'fwhost ip_mac' => 'IP/MAC address',
'fwhost ipadr' => 'IP address:',
'fwhost ipsec host' => 'IPsec clients:',
'fwhost IpSec Host' => 'IPsec host',
'fwhost ipsec net' => 'IPsec networks:',
'fwhost IpSec Network' => 'IPsec network',
'fwhost menu' => 'Firewall Groups',
'fwhost netaddress' => 'Network address',
'fwhost newgrp' => 'Network/Host Groups',
@@ -1123,6 +1127,9 @@
'fwhost newservice' => 'Services',
'fwhost newservicegrp' => 'Service Groups',
'fwhost orange' => 'Orange',
'fwhost OpenVPN static host' => 'OpenVPN static host',
'fwhost OpenVPN static network' => 'OpenVPN static network',
'fwhost OpenVPN N-2-N' => 'OpenVPN Net-to-Net',
'fwhost ovpn_n2n' => 'OpenVPN Net-to-Net',
'fwhost port' => 'Port(s)',
'fwhost prot' => 'Protocol',
@@ -1131,6 +1138,7 @@
'fwhost services' => 'Services:',
'fwhost srv_name' => 'Service name',
'fwhost stdnet' => 'Standard networks:',
'fwhost Standard Network' => 'Standard network',
'fwhost type' => 'Type',
'fwhost used' => 'Used',
'fwhost welcome' => 'Over here, you can group single hosts, networks and services together, which will creating new rules more easy and faster.',