From 1a8fde0e845eab654aeee6dc5b780c3e4596cb4d Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Mon, 1 Jul 2013 16:38:14 +0200 Subject: [PATCH] Forward Firewall: changed some names and added subnets to dropdowns --- config/cfgroot/general-functions.pl | 4 ++-- html/cgi-bin/forwardfw.cgi | 9 ++++++--- html/cgi-bin/fwhosts.cgi | 22 +++++++++++----------- langs/de/cgi-bin/de.pl | 18 ++++++++++-------- langs/en/cgi-bin/en.pl | 28 +++++++++++++++------------- 5 files changed, 44 insertions(+), 37 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 07bbab67a3..c57de1996e 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -82,8 +82,8 @@ sub setup_default_networks my ($ip,$sub) = split(/\//,$ovpnSettings{'DOVPN_SUBNET'}); $sub=&General::iporsubtocidr($sub); my @tempovpnsubnet = split("\/", $ovpnSettings{'DOVPN_SUBNET'}); - $defaultNetworks->{'OpenVPN ' .$ip."/".$sub}{'ADR'} = $tempovpnsubnet[0]; - $defaultNetworks->{'OpenVPN ' .$ip."/".$sub}{'NAME'} = "OpenVPN-Dyn"; + $defaultNetworks->{'OpenVPN ' ."($ip/$sub)"}{'ADR'} = $tempovpnsubnet[0]; + $defaultNetworks->{'OpenVPN ' ."($ip/$sub)"}{'NAME'} = "OpenVPN-Dyn"; } } # end OpenVPN # IPsec RW NET diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi index 716f588108..57eff4dff2 100755 --- a/html/cgi-bin/forwardfw.cgi +++ b/html/cgi-bin/forwardfw.cgi @@ -994,9 +994,12 @@ END print ""; + print ">$network ($ifaces{$defnet}/$defsub1)"; }else{ print ">$network"; } @@ -1694,7 +1697,7 @@ END #---Activate/logging/remark------------------------------------- &Header::openbox('100%', 'left', $Lang::tr{'fwdfw additional'}); print< + "; - print""; + print""; #print""; if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on'){ print " - - + + + END @@ -1107,8 +1107,8 @@ sub addhost $fwhostsettings{'orgremark'}=$fwhostsettings{'HOSTREMARK'}; print<
- - + + END @@ -1147,7 +1147,7 @@ sub addgrp if ($fwhostsettings{'update'} eq ''){ print< - +
$Lang::tr{'fwdfw rule action'}
$Lang::tr{'remark'}:
$Lang::tr{'remark'}:
$Lang::tr{'remark'}:
$Lang::tr{'fwdfw rulepos'}:
$Lang::tr{'name'}:
$Lang::tr{'fwhost netaddress'}:
$Lang::tr{'netmask'}:
$Lang::tr{'name'}:
$Lang::tr{'fwhost netaddress'}:
$Lang::tr{'netmask'}:
$Lang::tr{'remark'}:

$Lang::tr{'name'}:
IP/MAC:
$Lang::tr{'name'}:
IP/MAC:
$Lang::tr{'remark'}:
$Lang::tr{'fwhost addgrpname'}
$Lang::tr{'fwhost addgrpname'}
$Lang::tr{'remark'}:

END @@ -1242,7 +1242,7 @@ sub addservice { &error; &showmenu; - &Header::openbox('100%', 'left', $Lang::tr{'fwhost newservice'}); + &Header::openbox('100%', 'left', $Lang::tr{'fwhost addservice'}); if ($fwhostsettings{'updatesrv'} eq 'on') { $fwhostsettings{'oldsrvname'} = $fwhostsettings{'SRV_NAME'}; @@ -1251,7 +1251,7 @@ sub addservice } print< - $Lang::tr{'fwhost srv_name'}: + $Lang::tr{'fwhost srv_name'}: $Lang::tr{'fwhost prot'}: + $Lang::tr{'fwhost port'}:
END @@ -1306,12 +1306,12 @@ sub addservicegrp &hint; &error; &showmenu; - &Header::openbox('100%', 'left', $Lang::tr{'fwhost newservicegrp'}); + &Header::openbox('100%', 'left', $Lang::tr{'fwhost addservicegrp'}); $fwhostsettings{'oldsrvgrpremark'}=$fwhostsettings{'SRVGRP_REMARK'}; if ($fwhostsettings{'updatesrvgrp'} eq ''){ print< - $Lang::tr{'fwhost addgrpname'} + $Lang::tr{'fwhost addgrpname'} $Lang::tr{'remark'}:
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b205c85bc1..5ff88f43d3 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -972,11 +972,13 @@ 'fwdfw wd_sat' => 'Sa', 'fwdfw wd_sun' => 'So', 'fwdfw xt access' => 'Input', -'fwhost addgrp' => 'Gruppe:', +'fwhost addgrp' => 'Gruppe hinzufügen:', 'fwhost addgrpname' => 'Gruppenname:', -'fwhost addhost' => 'Adresse:', -'fwhost addnet' => 'Netzwerk:', +'fwhost addhost' => 'Host hinzufügen:', +'fwhost addnet' => 'Netzwerk hinzufügen:', 'fwhost addrule' => 'Regel hinzufügen/ändern:', +'fwhost addservice' => 'Dienst hinzufügen:', +'fwhost addservicegrp' => 'Dienstgruppe hinzufügen:', 'fwhost any' => 'Alle', 'fwhost attention' => 'ACHTUNG', 'fwhost back' => 'Zurück', @@ -985,7 +987,7 @@ 'fwhost ccdnet' => 'OpenVPN Netzwerke:', 'fwhost change' => 'Ändern', 'fwhost changeremark' => 'Es wurde nur die Bemerkung angepasst.', -'fwhost cust addr' => 'Adressen:', +'fwhost cust addr' => 'Hosts:', 'fwhost cust grp' => 'Gruppen:', 'fwhost cust net' => 'Netzwerke:', 'fwhost cust service' => 'Dienste:', @@ -1029,10 +1031,10 @@ 'fwhost ipsec host' => 'IPsec Clients:', 'fwhost ipsec net' => 'IPsec Netzwerke:', 'fwhost netaddress' => 'Netzwerk Adresse', -'fwhost newnet' => 'Netzeinstellungen', -'fwhost newhost' => 'Adresseinstellungen', -'fwhost newgrp' => 'Adressgruppierung', -'fwhost newservice' => 'Diensteinstellungen', +'fwhost newnet' => 'Netzwerke', +'fwhost newhost' => 'Hosts', +'fwhost newgrp' => 'Netzwerk-/ Hostgruppierung', +'fwhost newservice' => 'Dienst', 'fwhost newservicegrp' => 'Dienstgruppierung', 'fwhost menu' => 'Firewallgruppen', 'fwhost orange' => 'Orange', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 49a3c1ef89..c507327653 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -997,24 +997,26 @@ 'fwdfw wd_sat' => 'Sat', 'fwdfw wd_sun' => 'Sun', 'fwdfw xt access' => 'Access to firewall', -'fwhost addgrp' => 'Group:', +'fwhost addgrp' => 'Add Network / Host Group:', 'fwhost addgrpname' => 'Groupname:', -'fwhost addhost' => 'Address:', -'fwhost addnet' => 'Network:', +'fwhost addhost' => 'Add Host:', +'fwhost addnet' => 'Add Network:', 'fwhost addrule' => 'Add/Edit rule:', +'fwhost addservice' => 'Add Service:', +'fwhost addservicegrp' => 'Add Service Group:', 'fwhost any' => 'Any', 'fwhost attention' => 'ATTENTION', -'fwhost back' => 'back', +'fwhost back' => 'Back', 'fwhost blue' => 'Blue', 'fwhost ccdhost' => 'OpenVPN clients:', 'fwhost ccdnet' => 'OpenVPN networks:', 'fwhost change' => 'Modify', 'fwhost changeremark' => 'You just modified the remark', -'fwhost cust addr' => 'Addresses:', -'fwhost cust grp' => 'Groups:', +'fwhost cust addr' => 'Hosts:', +'fwhost cust grp' => 'Network / Host Groups:', 'fwhost cust net' => 'Networks:', 'fwhost cust service' => 'Services:', -'fwhost cust srvgrp' => 'Servicegroups', +'fwhost cust srvgrp' => 'Service groups:', 'fwhost deleted' => 'Deleted', 'fwhost empty' => 'No rules defined', 'fwhost err addr' => 'Invalid IP address or subnet', @@ -1054,11 +1056,11 @@ 'fwhost ipsec host' => 'IPsec clients:', 'fwhost ipsec net' => 'IPsec networks:', 'fwhost netaddress' => 'Network address', -'fwhost newnet' => 'Network', -'fwhost newhost' => 'Host', -'fwhost newgrp' => 'Address grouping', -'fwhost newservice' => 'Service', -'fwhost newservicegrp' => 'Service grouping', +'fwhost newnet' => 'Networks', +'fwhost newhost' => 'Hosts', +'fwhost newgrp' => 'Network / Host Groups', +'fwhost newservice' => 'Services', +'fwhost newservicegrp' => 'Service Groups', 'fwhost menu' => 'Firewall Groups', 'fwhost orange' => 'Orange', 'fwhost ovpn_n2n' => 'OpenVPN Net-to-Net', @@ -1066,7 +1068,7 @@ 'fwhost prot' => 'Protocol', 'fwhost reread' => 'Firewall rules need to be updated.', 'fwhost reset' => 'Cancel', -'fwhost services' => 'Services', +'fwhost services' => 'Services:', 'fwhost srv_name' => 'Servicename', 'fwhost stdnet' => 'Standard networks:', 'fwhost type' => 'Type', -- 2.39.2