From bc595f0985245d0186c8850e07b9a0629ae7a768 Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Thu, 17 Apr 2014 11:14:25 +0200 Subject: [PATCH] Firewall: Bug10513 --- html/cgi-bin/fwhosts.cgi | 10 +++------- langs/de/cgi-bin/de.pl | 8 ++++++++ langs/en/cgi-bin/en.pl | 8 ++++++++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index e8ddf461e..c5e1c2845 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -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]"; } if ($ip eq '' && $customgrp{$key}[2] ne $Lang::tr{'fwhost err emptytable'}){ - print "$Lang::tr{'fwhost deleted'}$customgrp{$key}[3]
"; + print "$Lang::tr{'fwhost deleted'}$Lang::tr{'fwhost '.$customgrp{$key}[3]}"; }else{ my ($colip,$colsub) = split("/",$ip); $ip="$colip/".&General::iporsubtocidr($colsub) if ($colsub); - print"".&getcolor($ip)."$customgrp{$key}[3]"; + print"".&getcolor($ip)."$Lang::tr{'fwhost '.$customgrp{$key}[3]}"; } if ($delflag > 0 && $ip ne ''){ print""; @@ -1858,8 +1855,7 @@ sub viewtablegrp } } } - print"
"; - + print""; $helper=$customgrp{$key}[0]; $number++; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 74bd6e887..4ee1d8e59 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -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.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index f8cdf7630..2940ebf4a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -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.', -- 2.39.2