This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, fifteen has been updated via c03d4a5e8a37c6fcbee55c5b7efa8930f9c98351 (commit) via bee56a2d5d1d901b93b2a72d5d855a2b3bb49f2b (commit) via 2a6e9ae967cd13e136cb563622236c979ba788c6 (commit) via e9a056234592750a42ff82c12e858069b32ab82e (commit) via daf400fa4d61a02eb17e24d29be01d2bbaa35f31 (commit) from 85860aff263c41a74ff274fca2998e941b9134f6 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit c03d4a5e8a37c6fcbee55c5b7efa8930f9c98351 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 29 18:45:40 2013 +0100
firewall: Simplify code which shows the last rule.
Also change headings of the rule sections.
commit bee56a2d5d1d901b93b2a72d5d855a2b3bb49f2b Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 29 16:57:58 2013 +0100
firewall: NAT section: Don't show irrelevant controls.
commit 2a6e9ae967cd13e136cb563622236c979ba788c6 Merge: e9a0562 daf400f Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 29 16:23:35 2013 +0100
Merge remote-tracking branch 'amarx/firewall-fifteen' into fifteen
commit e9a056234592750a42ff82c12e858069b32ab82e Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 29 16:22:13 2013 +0100
P2P block: Add notice that the user will reload the firewall ruleset.
commit daf400fa4d61a02eb17e24d29be01d2bbaa35f31 Author: Alexander Marx amarx@ipfire.org Date: Tue Oct 29 08:34:42 2013 +0100
Firewall: fixed untranslated Strings
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.de | 8 +- doc/language_issues.en | 8 +- doc/language_issues.es | 19 ++- doc/language_issues.fr | 19 ++- doc/language_issues.nl | 19 ++- doc/language_issues.pl | 19 ++- doc/language_issues.ru | 19 ++- doc/language_issues.tr | 19 ++- doc/language_missings | 44 ++++++ html/cgi-bin/firewall.cgi | 344 +++++++++++++++++++++++++++++---------------- html/cgi-bin/p2p-block.cgi | 129 +++++++++-------- langs/de/cgi-bin/de.pl | 8 ++ langs/en/cgi-bin/en.pl | 8 ++ 13 files changed, 427 insertions(+), 236 deletions(-)
Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 3393acd..c36be8a 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -164,7 +164,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -189,16 +188,18 @@ WARNING: translation string unused: from warn email bad WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 WARNING: translation string unused: fwdfw err tgt_port -WARNING: translation string unused: fwdfw external port nat +WARNING: translation string unused: fwdfw final_rule WARNING: translation string unused: fwdfw from WARNING: translation string unused: fwdfw ipsec network WARNING: translation string unused: fwdfw man port WARNING: translation string unused: fwdfw natport used +WARNING: translation string unused: fwdfw p2p txt WARNING: translation string unused: fwdfw rule action WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost addrule WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue @@ -210,6 +211,7 @@ WARNING: translation string unused: fwhost green WARNING: translation string unused: fwhost ipadr WARNING: translation string unused: fwhost ipsec host WARNING: translation string unused: fwhost orange +WARNING: translation string unused: fwhost reread WARNING: translation string unused: fwhost reset WARNING: translation string unused: fwhost wo subnet WARNING: translation string unused: gen static key @@ -346,7 +348,6 @@ WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: our donors WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -386,7 +387,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots diff --git a/doc/language_issues.en b/doc/language_issues.en index 77e825d..97da599 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -187,7 +187,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -212,16 +211,18 @@ WARNING: translation string unused: from warn email bad WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 WARNING: translation string unused: fwdfw err tgt_port -WARNING: translation string unused: fwdfw external port nat +WARNING: translation string unused: fwdfw final_rule WARNING: translation string unused: fwdfw from WARNING: translation string unused: fwdfw ipsec network WARNING: translation string unused: fwdfw man port WARNING: translation string unused: fwdfw natport used +WARNING: translation string unused: fwdfw p2p txt WARNING: translation string unused: fwdfw rule action WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost addrule WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue @@ -233,6 +234,7 @@ WARNING: translation string unused: fwhost green WARNING: translation string unused: fwhost ipadr WARNING: translation string unused: fwhost ipsec host WARNING: translation string unused: fwhost orange +WARNING: translation string unused: fwhost reread WARNING: translation string unused: fwhost reset WARNING: translation string unused: fwhost wo subnet WARNING: translation string unused: g.dtm @@ -373,7 +375,6 @@ WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: our donors WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -413,7 +414,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots diff --git a/doc/language_issues.es b/doc/language_issues.es index 6faff27..163b9f2 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -186,7 +186,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -342,7 +341,6 @@ WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -380,7 +378,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots @@ -593,7 +590,9 @@ WARNING: untranslated string: ccd none WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used +WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn +WARNING: untranslated string: dnat address WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration @@ -624,6 +623,7 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -659,20 +659,23 @@ WARNING: untranslated string: fwdfw err tgt_addr WARNING: untranslated string: fwdfw err tgt_grp WARNING: untranslated string: fwdfw err tgt_mac WARNING: untranslated string: fwdfw err time -WARNING: untranslated string: fwdfw final_rule +WARNING: untranslated string: fwdfw external port nat WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 +WARNING: untranslated string: fwdfw iface +WARNING: untranslated string: fwdfw log WARNING: untranslated string: fwdfw log rule WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup WARNING: untranslated string: fwdfw newrule -WARNING: untranslated string: fwdfw p2p txt WARNING: untranslated string: fwdfw pol allow WARNING: untranslated string: fwdfw pol block WARNING: untranslated string: fwdfw pol text WARNING: untranslated string: fwdfw pol text1 WARNING: untranslated string: fwdfw pol title +WARNING: untranslated string: fwdfw prot41 +WARNING: untranslated string: fwdfw prot41 short WARNING: untranslated string: fwdfw red WARNING: untranslated string: fwdfw reread WARNING: untranslated string: fwdfw rule activate @@ -696,7 +699,6 @@ WARNING: untranslated string: fwdfw wd_sun WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwdfw xt access WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@ -756,7 +758,6 @@ WARNING: untranslated string: fwhost newservicegrp WARNING: untranslated string: fwhost ovpn_n2n WARNING: untranslated string: fwhost port WARNING: untranslated string: fwhost prot -WARNING: untranslated string: fwhost reread WARNING: untranslated string: fwhost services WARNING: untranslated string: fwhost srv_name WARNING: untranslated string: fwhost stdnet @@ -767,6 +768,7 @@ WARNING: untranslated string: least preferred WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: new +WARNING: untranslated string: notice WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used WARNING: untranslated string: openvpn fragment allowed with udp @@ -799,6 +801,8 @@ WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment WARNING: untranslated string: ovpn mtu-disc yes WARNING: untranslated string: ovpn routes push WARNING: untranslated string: ovpn routes push options +WARNING: untranslated string: p2p block +WARNING: untranslated string: p2p block save notice WARNING: untranslated string: pakfire ago WARNING: untranslated string: proxy reports WARNING: untranslated string: proxy reports daily @@ -812,6 +816,7 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: server restart +WARNING: untranslated string: snat new source ip address WARNING: untranslated string: static routes WARNING: untranslated string: system information WARNING: untranslated string: tor diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 96e691e..d644104 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -186,7 +186,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -342,7 +341,6 @@ WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -382,7 +380,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots @@ -595,7 +592,9 @@ WARNING: untranslated string: ccd none WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used +WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn +WARNING: untranslated string: dnat address WARNING: untranslated string: dns address deleted txt WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry @@ -627,6 +626,7 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -662,20 +662,23 @@ WARNING: untranslated string: fwdfw err tgt_addr WARNING: untranslated string: fwdfw err tgt_grp WARNING: untranslated string: fwdfw err tgt_mac WARNING: untranslated string: fwdfw err time -WARNING: untranslated string: fwdfw final_rule +WARNING: untranslated string: fwdfw external port nat WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 +WARNING: untranslated string: fwdfw iface +WARNING: untranslated string: fwdfw log WARNING: untranslated string: fwdfw log rule WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup WARNING: untranslated string: fwdfw newrule -WARNING: untranslated string: fwdfw p2p txt WARNING: untranslated string: fwdfw pol allow WARNING: untranslated string: fwdfw pol block WARNING: untranslated string: fwdfw pol text WARNING: untranslated string: fwdfw pol text1 WARNING: untranslated string: fwdfw pol title +WARNING: untranslated string: fwdfw prot41 +WARNING: untranslated string: fwdfw prot41 short WARNING: untranslated string: fwdfw red WARNING: untranslated string: fwdfw reread WARNING: untranslated string: fwdfw rule activate @@ -699,7 +702,6 @@ WARNING: untranslated string: fwdfw wd_sun WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwdfw xt access WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@ -759,7 +761,6 @@ WARNING: untranslated string: fwhost newservicegrp WARNING: untranslated string: fwhost ovpn_n2n WARNING: untranslated string: fwhost port WARNING: untranslated string: fwhost prot -WARNING: untranslated string: fwhost reread WARNING: untranslated string: fwhost services WARNING: untranslated string: fwhost srv_name WARNING: untranslated string: fwhost stdnet @@ -770,6 +771,7 @@ WARNING: untranslated string: least preferred WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: new +WARNING: untranslated string: notice WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync WARNING: untranslated string: openvpn default @@ -789,6 +791,8 @@ WARNING: untranslated string: ovpn mtu-disc no WARNING: untranslated string: ovpn mtu-disc off WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment WARNING: untranslated string: ovpn mtu-disc yes +WARNING: untranslated string: p2p block +WARNING: untranslated string: p2p block save notice WARNING: untranslated string: pakfire ago WARNING: untranslated string: proxy reports WARNING: untranslated string: proxy reports daily @@ -802,6 +806,7 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: server restart +WARNING: untranslated string: snat new source ip address WARNING: untranslated string: snort working WARNING: untranslated string: static routes WARNING: untranslated string: system information diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 142ec4d..0d6fafb 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -188,7 +188,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -347,7 +346,6 @@ WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: our donors WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -387,7 +385,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots @@ -561,6 +558,8 @@ WARNING: untranslated string: age sminute WARNING: untranslated string: age ssecond WARNING: untranslated string: bytes WARNING: untranslated string: ccd iroute2 +WARNING: untranslated string: default ip +WARNING: untranslated string: dnat address WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration @@ -573,6 +572,7 @@ WARNING: untranslated string: drop action1 WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -608,20 +608,23 @@ WARNING: untranslated string: fwdfw err tgt_addr WARNING: untranslated string: fwdfw err tgt_grp WARNING: untranslated string: fwdfw err tgt_mac WARNING: untranslated string: fwdfw err time -WARNING: untranslated string: fwdfw final_rule +WARNING: untranslated string: fwdfw external port nat WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 +WARNING: untranslated string: fwdfw iface +WARNING: untranslated string: fwdfw log WARNING: untranslated string: fwdfw log rule WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup WARNING: untranslated string: fwdfw newrule -WARNING: untranslated string: fwdfw p2p txt WARNING: untranslated string: fwdfw pol allow WARNING: untranslated string: fwdfw pol block WARNING: untranslated string: fwdfw pol text WARNING: untranslated string: fwdfw pol text1 WARNING: untranslated string: fwdfw pol title +WARNING: untranslated string: fwdfw prot41 +WARNING: untranslated string: fwdfw prot41 short WARNING: untranslated string: fwdfw red WARNING: untranslated string: fwdfw reread WARNING: untranslated string: fwdfw rule activate @@ -645,7 +648,6 @@ WARNING: untranslated string: fwdfw wd_sun WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwdfw xt access WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@ -705,7 +707,6 @@ WARNING: untranslated string: fwhost newservicegrp WARNING: untranslated string: fwhost ovpn_n2n WARNING: untranslated string: fwhost port WARNING: untranslated string: fwhost prot -WARNING: untranslated string: fwhost reread WARNING: untranslated string: fwhost services WARNING: untranslated string: fwhost srv_name WARNING: untranslated string: fwhost stdnet @@ -715,13 +716,17 @@ WARNING: untranslated string: fwhost welcome WARNING: untranslated string: least preferred WARNING: untranslated string: most preferred WARNING: untranslated string: new +WARNING: untranslated string: notice WARNING: untranslated string: outgoing firewall reserved groupname +WARNING: untranslated string: p2p block +WARNING: untranslated string: p2p block save notice WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: red1 WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: snat new source ip address WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 6faff27..163b9f2 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -186,7 +186,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -342,7 +341,6 @@ WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -380,7 +378,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots @@ -593,7 +590,9 @@ WARNING: untranslated string: ccd none WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used +WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn +WARNING: untranslated string: dnat address WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration @@ -624,6 +623,7 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -659,20 +659,23 @@ WARNING: untranslated string: fwdfw err tgt_addr WARNING: untranslated string: fwdfw err tgt_grp WARNING: untranslated string: fwdfw err tgt_mac WARNING: untranslated string: fwdfw err time -WARNING: untranslated string: fwdfw final_rule +WARNING: untranslated string: fwdfw external port nat WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 +WARNING: untranslated string: fwdfw iface +WARNING: untranslated string: fwdfw log WARNING: untranslated string: fwdfw log rule WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup WARNING: untranslated string: fwdfw newrule -WARNING: untranslated string: fwdfw p2p txt WARNING: untranslated string: fwdfw pol allow WARNING: untranslated string: fwdfw pol block WARNING: untranslated string: fwdfw pol text WARNING: untranslated string: fwdfw pol text1 WARNING: untranslated string: fwdfw pol title +WARNING: untranslated string: fwdfw prot41 +WARNING: untranslated string: fwdfw prot41 short WARNING: untranslated string: fwdfw red WARNING: untranslated string: fwdfw reread WARNING: untranslated string: fwdfw rule activate @@ -696,7 +699,6 @@ WARNING: untranslated string: fwdfw wd_sun WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwdfw xt access WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@ -756,7 +758,6 @@ WARNING: untranslated string: fwhost newservicegrp WARNING: untranslated string: fwhost ovpn_n2n WARNING: untranslated string: fwhost port WARNING: untranslated string: fwhost prot -WARNING: untranslated string: fwhost reread WARNING: untranslated string: fwhost services WARNING: untranslated string: fwhost srv_name WARNING: untranslated string: fwhost stdnet @@ -767,6 +768,7 @@ WARNING: untranslated string: least preferred WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: new +WARNING: untranslated string: notice WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used WARNING: untranslated string: openvpn fragment allowed with udp @@ -799,6 +801,8 @@ WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment WARNING: untranslated string: ovpn mtu-disc yes WARNING: untranslated string: ovpn routes push WARNING: untranslated string: ovpn routes push options +WARNING: untranslated string: p2p block +WARNING: untranslated string: p2p block save notice WARNING: untranslated string: pakfire ago WARNING: untranslated string: proxy reports WARNING: untranslated string: proxy reports daily @@ -812,6 +816,7 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: server restart +WARNING: untranslated string: snat new source ip address WARNING: untranslated string: static routes WARNING: untranslated string: system information WARNING: untranslated string: tor diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 4be5db7..5f06c94 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -185,7 +185,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: filename WARNING: translation string unused: firewall graphs @@ -336,7 +335,6 @@ WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -376,7 +374,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots @@ -588,8 +585,10 @@ WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used WARNING: untranslated string: community rules +WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: disk access per +WARNING: untranslated string: dnat address WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration @@ -610,6 +609,7 @@ WARNING: untranslated string: extrahd maybe the device is in use WARNING: untranslated string: extrahd to WARNING: untranslated string: extrahd to root WARNING: untranslated string: extrahd you cant mount +WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -645,20 +645,23 @@ WARNING: untranslated string: fwdfw err tgt_addr WARNING: untranslated string: fwdfw err tgt_grp WARNING: untranslated string: fwdfw err tgt_mac WARNING: untranslated string: fwdfw err time -WARNING: untranslated string: fwdfw final_rule +WARNING: untranslated string: fwdfw external port nat WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 +WARNING: untranslated string: fwdfw iface +WARNING: untranslated string: fwdfw log WARNING: untranslated string: fwdfw log rule WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup WARNING: untranslated string: fwdfw newrule -WARNING: untranslated string: fwdfw p2p txt WARNING: untranslated string: fwdfw pol allow WARNING: untranslated string: fwdfw pol block WARNING: untranslated string: fwdfw pol text WARNING: untranslated string: fwdfw pol text1 WARNING: untranslated string: fwdfw pol title +WARNING: untranslated string: fwdfw prot41 +WARNING: untranslated string: fwdfw prot41 short WARNING: untranslated string: fwdfw red WARNING: untranslated string: fwdfw reread WARNING: untranslated string: fwdfw rule activate @@ -682,7 +685,6 @@ WARNING: untranslated string: fwdfw wd_sun WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwdfw xt access WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@ -742,7 +744,6 @@ WARNING: untranslated string: fwhost newservicegrp WARNING: untranslated string: fwhost ovpn_n2n WARNING: untranslated string: fwhost port WARNING: untranslated string: fwhost prot -WARNING: untranslated string: fwhost reread WARNING: untranslated string: fwhost services WARNING: untranslated string: fwhost srv_name WARNING: untranslated string: fwhost stdnet @@ -754,6 +755,7 @@ WARNING: untranslated string: least preferred WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: new +WARNING: untranslated string: notice WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used WARNING: untranslated string: openvpn fragment allowed with udp @@ -772,6 +774,8 @@ WARNING: untranslated string: ovpn mtu-disc no WARNING: untranslated string: ovpn mtu-disc off WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment WARNING: untranslated string: ovpn mtu-disc yes +WARNING: untranslated string: p2p block +WARNING: untranslated string: p2p block save notice WARNING: untranslated string: proxy reports WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly @@ -784,6 +788,7 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: server restart +WARNING: untranslated string: snat new source ip address WARNING: untranslated string: static routes WARNING: untranslated string: tor WARNING: untranslated string: tor accounting diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 5ebf41a..ba02f89 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -188,7 +188,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -347,7 +346,6 @@ WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: our donors WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -387,7 +385,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots @@ -558,6 +555,8 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent WARNING: untranslated string: bytes +WARNING: untranslated string: default ip +WARNING: untranslated string: dnat address WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration @@ -570,6 +569,7 @@ WARNING: untranslated string: drop action1 WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -605,20 +605,23 @@ WARNING: untranslated string: fwdfw err tgt_addr WARNING: untranslated string: fwdfw err tgt_grp WARNING: untranslated string: fwdfw err tgt_mac WARNING: untranslated string: fwdfw err time -WARNING: untranslated string: fwdfw final_rule +WARNING: untranslated string: fwdfw external port nat WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 +WARNING: untranslated string: fwdfw iface +WARNING: untranslated string: fwdfw log WARNING: untranslated string: fwdfw log rule WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup WARNING: untranslated string: fwdfw newrule -WARNING: untranslated string: fwdfw p2p txt WARNING: untranslated string: fwdfw pol allow WARNING: untranslated string: fwdfw pol block WARNING: untranslated string: fwdfw pol text WARNING: untranslated string: fwdfw pol text1 WARNING: untranslated string: fwdfw pol title +WARNING: untranslated string: fwdfw prot41 +WARNING: untranslated string: fwdfw prot41 short WARNING: untranslated string: fwdfw red WARNING: untranslated string: fwdfw reread WARNING: untranslated string: fwdfw rule activate @@ -642,7 +645,6 @@ WARNING: untranslated string: fwdfw wd_sun WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwdfw xt access WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost @@ -702,7 +704,6 @@ WARNING: untranslated string: fwhost newservicegrp WARNING: untranslated string: fwhost ovpn_n2n WARNING: untranslated string: fwhost port WARNING: untranslated string: fwhost prot -WARNING: untranslated string: fwhost reread WARNING: untranslated string: fwhost services WARNING: untranslated string: fwhost srv_name WARNING: untranslated string: fwhost stdnet @@ -712,12 +713,16 @@ WARNING: untranslated string: fwhost welcome WARNING: untranslated string: least preferred WARNING: untranslated string: most preferred WARNING: untranslated string: new +WARNING: untranslated string: notice WARNING: untranslated string: outgoing firewall reserved groupname +WARNING: untranslated string: p2p block +WARNING: untranslated string: p2p block save notice WARNING: untranslated string: red1 WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: snat new source ip address WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes diff --git a/doc/language_missings b/doc/language_missings index c5f8ac0..be8ec62 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -59,7 +59,9 @@ < ccd routes < ccd subnet < ccd used +< default ip < deprecated fs warn +< dnat address < dns address deleted txt < dnsforward < dnsforward add a new entry @@ -90,6 +92,7 @@ < fireinfo why enable < fireinfo why read more < fireinfo your profile id +< firewall rules < forward firewall < fw default drop < fwdfw ACCEPT @@ -126,7 +129,9 @@ < fwdfw from < fwdfw hint ip1 < fwdfw hint ip2 +< fwdfw iface < fwdfw ipsec network +< fwdfw log < fwdfw log rule < fwdfw man port < fwdfw menu @@ -142,6 +147,8 @@ < fwdfw pol text < fwdfw pol text1 < fwdfw pol title +< fwdfw prot41 +< fwdfw prot41 short < fwdfw red < fwdfw REJECT < fwdfw reread @@ -258,6 +265,7 @@ < least preferred < minute < most preferred +< notice < ntp common settings < ntp sync < openvpn default @@ -279,6 +287,8 @@ < ovpn mtu-disc off < ovpn mtu-disc with mssfix or fragment < ovpn mtu-disc yes +< p2p block +< p2p block save notice < proxy reports < proxy reports daily < proxy reports monthly @@ -287,6 +297,7 @@ < qos enter bandwidths < red1 < server restart +< snat new source ip address < snort working < static routes < system information @@ -459,7 +470,9 @@ < ccd routes < ccd subnet < ccd used +< default ip < deprecated fs warn +< dnat address < dnsforward < dnsforward add a new entry < dnsforward configuration @@ -489,6 +502,7 @@ < fireinfo why enable < fireinfo why read more < fireinfo your profile id +< firewall rules < forward firewall < fw default drop < fwdfw ACCEPT @@ -525,7 +539,9 @@ < fwdfw from < fwdfw hint ip1 < fwdfw hint ip2 +< fwdfw iface < fwdfw ipsec network +< fwdfw log < fwdfw log rule < fwdfw man port < fwdfw menu @@ -541,6 +557,8 @@ < fwdfw pol text < fwdfw pol text1 < fwdfw pol title +< fwdfw prot41 +< fwdfw prot41 short < fwdfw red < fwdfw REJECT < fwdfw reread @@ -657,6 +675,7 @@ < least preferred < minute < most preferred +< notice < openvpn default < openvpn destination port used < openvpn disabled @@ -694,6 +713,8 @@ < ovpn mtu-disc yes < ovpn routes push < ovpn routes push options +< p2p block +< p2p block save notice < proxy reports < proxy reports daily < proxy reports monthly @@ -703,6 +724,7 @@ < red1 < server restart < Set time on boot +< snat new source ip address < static routes < system information < tor @@ -850,7 +872,9 @@ < ccd routes < ccd subnet < ccd used +< default ip < deprecated fs warn +< dnat address < dnsforward < dnsforward add a new entry < dnsforward configuration @@ -872,6 +896,7 @@ < extrahd unable to read < extrahd unable to write < extrahd you cant mount +< firewall rules < forward firewall < fw default drop < fwdfw ACCEPT @@ -908,7 +933,9 @@ < fwdfw from < fwdfw hint ip1 < fwdfw hint ip2 +< fwdfw iface < fwdfw ipsec network +< fwdfw log < fwdfw log rule < fwdfw man port < fwdfw menu @@ -924,6 +951,8 @@ < fwdfw pol text < fwdfw pol text1 < fwdfw pol title +< fwdfw prot41 +< fwdfw prot41 short < fwdfw red < fwdfw REJECT < fwdfw reread @@ -1040,6 +1069,7 @@ < least preferred < minute < most preferred +< notice < openvpn default < openvpn destination port used < openvpn disabled @@ -1063,6 +1093,8 @@ < ovpn mtu-disc yes < ovpn routes push < ovpn routes push options +< p2p block +< p2p block save notice < proxy reports < proxy reports daily < proxy reports monthly @@ -1071,6 +1103,7 @@ < qos enter bandwidths < red1 < server restart +< snat new source ip address < static routes < tor < tor 0 = disabled @@ -1219,8 +1252,10 @@ < ccd subnet < ccd used < day-graph +< default ip < deprecated fs warn < disk access per +< dnat address < dnsforward < dnsforward add a new entry < dnsforward configuration @@ -1243,6 +1278,7 @@ < extrahd unable to read < extrahd unable to write < extrahd you cant mount +< firewall rules < forward firewall < frequency < fw default drop @@ -1280,7 +1316,9 @@ < fwdfw from < fwdfw hint ip1 < fwdfw hint ip2 +< fwdfw iface < fwdfw ipsec network +< fwdfw log < fwdfw log rule < fwdfw man port < fwdfw menu @@ -1296,6 +1334,8 @@ < fwdfw pol text < fwdfw pol text1 < fwdfw pol title +< fwdfw prot41 +< fwdfw prot41 short < fwdfw red < fwdfw REJECT < fwdfw reread @@ -1415,6 +1455,7 @@ < minute < month-graph < most preferred +< notice < openvpn default < openvpn destination port used < openvpn disabled @@ -1435,6 +1476,8 @@ < ovpn mtu-disc off < ovpn mtu-disc with mssfix or fragment < ovpn mtu-disc yes +< p2p block +< p2p block save notice < proxy reports < proxy reports daily < proxy reports monthly @@ -1443,6 +1486,7 @@ < qos enter bandwidths < red1 < server restart +< snat new source ip address < static routes < tor < tor 0 = disabled diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index ffd8adf..8deeb1c 100755 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -458,15 +458,13 @@ sub addrule { &error;
- &Header::openbox('100%', 'left', $Lang::tr{'fwdfw menu'}); + &Header::openbox('100%', 'left', ""); print <<END; <form method="POST" action=""> <table border='0' width="100%"> <tr> - <td> + <td align='center'> <input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'> - </td> - <td align="right"> END
if (&General::firewall_needs_reload()) { @@ -481,8 +479,9 @@ END </table> </form>
- <hr> + <br> END + &Header::closebox(); &viewtablerule; } @@ -1661,6 +1660,7 @@ END &gen_dd_block('src','grp1'); print"<hr>"; &Header::closebox(); + #---SNAT / DNAT ------------------------------------------------ &Header::openbox('100%', 'left', 'NAT'); print<<END; @@ -1671,39 +1671,75 @@ END <div class="NAT"> <table width='100%' border='0'> <tr> - <td colspan='2'></td> - <td width='1%'> - <input type='radio' name='nat' id='dnat' value='dnat' checked> + <td width='5%'></td> + <td width='40%'> + <label> + <input type='radio' name='nat' id='dnat' value='dnat' checked> + $Lang::tr{'fwdfw dnat'} + </label> + </td> +END + + if (%aliases) { + 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'}</option> +END + foreach my $alias (sort keys %aliases) { + print "<option value='$alias' $selected{'dnat'}{$alias}>$alias</option>"; + } + + print "</select>"; + } else { + print <<END; + <td colspan="2" width='55%'> + <input type='hidden' name='dnat' value='Default IP'> </td> - <td width='50%'>$Lang::tr{'fwdfw dnat'}</td> END - print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='dnat' style='width:140px;'>"; - print "<option value='ALL' $selected{'dnat'}{$Lang::tr{'all'}}>$Lang::tr{'all'}</option>"; - print "<option value='Default IP' $selected{'dnat'}{'Default IP'}>Default IP</option>"; - foreach my $alias (sort keys %aliases) - { - print "<option value='$alias' $selected{'dnat'}{$alias}>$alias</option>"; } - print"</select></td></tr>"; + print "</tr>"; + #SNAT - print"<tr><td colspan='2'></td><td width='1%'><input type='radio' name='nat' id='snat' value='snat' $checked{'nat'}{'snat'}></td><td width='20%'>$Lang::tr{'fwdfw snat'}</td>"; - print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='snat' style='width:140px;'>"; - foreach my $alias (sort keys %aliases) - { - print "<option value='$alias' $selected{'snat'}{$alias}>$alias</option>"; - } - foreach my $network (sort keys %defaultNetworks) - { + print <<END; + <tr> + <td width='5%'></td> + <td width='40%'> + <label> + <input type='radio' name='nat' id='snat' value='snat' $checked{'nat'}{'snat'}> + $Lang::tr{'fwdfw snat'} + </label> + </td> + <td width='25%' align='right'>$Lang::tr{'snat new source ip address'}:</td> + <td width='30%'> + <select name='snat' style='width: 100%;'> +END + + foreach my $alias (sort keys %aliases) { + print "<option value='$alias' $selected{'snat'}{$alias}>$alias</option>"; + } + + # XXX this is composed in a very ugly fashion + 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); + print "<option value='$defaultNetworks{$network}{'NAME'}'"; print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'}); print ">$network</option>"; } - print"</select></td></tr></table>"; - print"</div>"; + + print <<END; + </select> + </td> + </tr> + </table> + </div> +END &Header::closebox(); + #---TARGET------------------------------------------------------ &Header::openbox('100%', 'left', $Lang::tr{'fwdfw target'}); print<<END; @@ -2325,27 +2361,35 @@ sub validremark return 0;} return 1; } -sub viewtablerule -{ + +sub viewtablerule { &General::readhash("/var/ipfire/ethernet/settings", %netsettings); - &viewtablenew(%configfwdfw,$configfwdfw,"","Forward" ); - &viewtablenew(%configinputfw,$configinput,"",$Lang::tr{'fwdfw xt access'} ); - &viewtablenew(%configoutgoingfw,$configoutgoing,"","Outgoing" ); + + &viewtablenew(%configfwdfw, $configfwdfw, $Lang::tr{'firewall rules'}); + &viewtablenew(%configinputfw, $configinput, $Lang::tr{'external access'}); + &viewtablenew(%configoutgoingfw, $configoutgoing, $Lang::tr{'outgoing firewall'}); } + sub viewtablenew { my $hash=shift; my $config=shift; my $title=shift; - my $title1=shift; my $go=''; + + my $show_box = (! -z $config) || ($optionsfw{'SHOWTABLES'} eq 'on'); + return if (!$show_box); + &General::get_aliases(%aliases); &General::readhasharray("$confighost", %customhost); &General::readhasharray("$config", $hash); &General::readhasharray("$configccdnet", %ccdnet); &General::readhasharray("$configccdhost", %ccdhost); - if( ! -z $config){ - &Header::openbox('100%', 'left',$title); + + &Header::openbox('100%', 'left', $title); + print "<table width='100%' cellspacing='0' border='0'>"; + + if (! -z $config) { my $count=0; my ($gif,$log); my $ruletype; @@ -2353,11 +2397,8 @@ sub viewtablenew my $tooltip; my @tmpsrc=(); my $coloryellow=''; - print <<END; - <b>$title1</b> - <br>
- <table width='100%' cellspacing='0' border='0'> + print <<END; <tr> <th align='right' width='3%'> # @@ -2370,7 +2411,7 @@ sub viewtablenew <b>$Lang::tr{'fwdfw source'}</b> </th> <th align='center'> - Log <!-- XXX UNTRANSLATED STRING --> + <b>$Lang::tr{'fwdfw log'}</b> </th> <th align='center' width='30%'> <b>$Lang::tr{'fwdfw target'}</b> @@ -2493,7 +2534,7 @@ END &getcolor($$hash{$key}[3],$$hash{$key}[4],%customhost); print"<td align='center' width='30%' $tdcolor>"; if ($$hash{$key}[3] eq 'ipfire_src'){ - $ipfireiface='Interface '; # XXX UNTRANSLATED STRING + $ipfireiface=$Lang::tr{'fwdfw iface'}; } if ($$hash{$key}[3] eq 'std_net_src'){ print &get_name($$hash{$key}[4]); @@ -2682,97 +2723,152 @@ END } print"<tr bgcolor='FFFFFF'><td colspan='13' height='1'></td></tr>"; } - print"</table>"; - #SHOW FINAL RULE - print "<table width='100%'rules='cols' border='1'>"; - my $col; - if ($config eq '/var/ipfire/firewall/config'){ - my $pol='fwdfw '.$fwdfwsettings{'POLICY'}; - if ($fwdfwsettings{'POLICY'} eq 'MODE1'){ - $col="bgcolor='darkred'"; - }else{ - $col="bgcolor='green'"; - } - &show_defaultrules($col,$pol); - }elsif ($config eq '/var/ipfire/firewall/outgoing'){ - if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){ - $col="bgcolor='darkred'"; - print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol block'}</font></td></tr>"; - }else{ - $col="bgcolor='green'"; - print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol allow'}</font></td></tr>"; - } - }else{ - print"<tr><td bgcolor='darkred' width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td bgcolor='darkred' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>"; + } elsif ($optionsfw{'SHOWTABLES'} eq 'on') { + print <<END; + <tr> + <td colspan='7' height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td> + </tr> +END + } + + #SHOW FINAL RULE + my $policy = 'fwdfw ' . $fwdfwsettings{'POLICY'}; + my $colour = "bgcolor='green'"; + if ($fwdfwsettings{'POLICY'} eq 'MODE1') { + $colour = "bgcolor='darkred'"; + } + + my $message; + if (($config eq '/var/ipfire/firewall/config') && ($fwdfwsettings{'POLICY'} ne 'MODE1')) { + print <<END; + <tr> + <td colspan='13'> </td> + </tr> + <tr> + <td colspan='13'> + <table width="100%" border='1' rules="cols" cellspacing='0'> +END + + # GREEN + print <<END; + <tr> + <td align='center'> + <font color="$Header::colourgreen">$Lang::tr{'green'}</font> + </td> + <td align='center'> + <font color="$Header::colourred">$Lang::tr{'red'}</font> + ($Lang::tr{'fwdfw pol allow'}) + </td> +END + + if (&Header::orange_used()) { + print <<END; + <td align='center'> + <font color="$Header::colourorange">$Lang::tr{'orange'}</font> + ($Lang::tr{'fwdfw pol allow'}) + </td> +END } - print"</table>"; - print "<hr>"; - print "<br><br>"; - &Header::closebox(); - }else{ - if ($optionsfw{'SHOWTABLES'} eq 'on'){ - print "<b>$title1</b><br>"; - print"<table width='100%' border='0' rules='none'><tr><td height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td></tr></table>"; - my $col; - if ($config eq '/var/ipfire/firewall/config'){ - my $pol='fwdfw '.$fwdfwsettings{'POLICY'}; - if ($fwdfwsettings{'POLICY'} eq 'MODE1'){ - $col="bgcolor='darkred'"; - }else{ - $col="bgcolor='green'"; - } - &show_defaultrules($col,$pol); - }elsif ($config eq '/var/ipfire/firewall/outgoing'){ - print "<table width='100%' rules='cols' border='1'>"; - my $pol='fwdfw '.$fwdfwsettings{'POLICY1'}; - if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){ - $col="bgcolor='darkred'"; - print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>"; - }else{ - $col="bgcolor='green'"; - print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>"; - } - }else{ - print "<table width='100%' rules='cols' border='1'>"; - print"<tr><td bgcolor='darkred' align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td align='center' bgcolor='darkred'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>"; - } - print"</table><br><br>"; + + if (&Header::blue_used()) { + print <<END; + <td align='center'> + <font color="$Header::colourblue">$Lang::tr{'blue'}</font> + ($Lang::tr{'fwdfw pol allow'}) + </td> +END } - } -} -&Header::closebigbox(); -&Header::closepage();
-sub show_defaultrules -{ - my $col=shift; - my $pol=shift; - #STANDARD RULES (From WIKI) - print"</table>"; - if ($col eq "bgcolor='green'"){ - print "<br><table width='100%' rules='cols' border='1' >"; - my $blue = "<font color=$Header::colourblue> $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol block'})" if (&Header::blue_used()); - my $orange = "<font color=$Header::colourorange> $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol block'})" if (&Header::orange_used()); - my $blue1 = "<font color=$Header::colourblue> $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol allow'})" if (&Header::blue_used()); - my $orange1 = "<font color=$Header::colourorange> $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol allow'})" if (&Header::orange_used()); - print"<tr><td align='center'><font color='#000000'>$Lang::tr{'green'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td>"; - print"<td align='center'>$orange1</td>" if (&Header::orange_used()); - print"<td align='center'>$blue1</td>" if (&Header::blue_used()); print"</tr>"; - if (&Header::orange_used()){ - print"<tr><td align='center' width='20%'><font color='#000000'>$Lang::tr{'orange'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td><td align='center'><font color=$Header::colourgreen> $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td>"; - print"<td align='center'>$blue</td>" if (&Header::blue_used()); + + # ORANGE + if (&Header::orange_used()) { + print <<END; + <tr> + <td align='center' width='20%'> + <font color="$Header::colourorange">$Lang::tr{'orange'}</font> + </td> + <td align='center'> + <font color="$Header::colourred">$Lang::tr{'red'}</font> + ($Lang::tr{'fwdfw pol allow'}) + </td> + <td align='center'> + <font color="$Header::colourgreen">$Lang::tr{'green'}</font> + ($Lang::tr{'fwdfw pol block'}) + </td> +END + + if (&Header::blue_used()) { + print <<END; + <td align='center'> + <font color="$Header::colourblue">$Lang::tr{'blue'}</font> + ($Lang::tr{'fwdfw pol block'}) + </td> +END + } + print"</tr>"; } - if (&Header::blue_used()){ - print"<tr><td align='center'><font color='#000000'>$Lang::tr{'blue'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td>"; - print"<td align='center'>$orange</td>" if (&Header::orange_used()); - print"<td align='center'><font color=$Header::colourgreen> $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td>"; + + if (&Header::blue_used()) { + print <<END; + <tr> + <td align='center'> + <font color="&Header::colourblue">$Lang::tr{'blue'}</font> + </td> + <td align='center'> + <font color="$Header::colourred">$Lang::tr{'red'}</font> + ($Lang::tr{'fwdfw pol allow'}) + </td> +END + + if (&Header::orange_used()) { + print <<END; + <td align='center'> + <font color="$Header::colourorange">$Lang::tr{'orange'}</font> + ($Lang::tr{'fwdfw pol block'}) + </td> + <td align='center'> + <font color="$Header::colourgreen">$Lang::tr{'green'}</font> + ($Lang::tr{'fwdfw pol block'}) + </td> +END + } + print"</tr>"; } - print"<tr><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'} </font></td><td $col colspan='3' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>"; - }elsif($col eq "bgcolor='darkred'"){ - print "<table width='100%' rules='cols' border='1' >"; - print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>"; + + print <<END; + </table> + </td> + </tr> +END + + $message = $Lang::tr{'fwdfw pol allow'}; + + } elsif ($config eq '/var/ipfire/firewall/outgoing') { + $message = $Lang::tr{'fwdfw pol allow'}; + + } else { + $message = $Lang::tr{'fwdfw pol block'}; + $colour = "bgcolor='darkred'"; } + + if ($message) { + print <<END; + <tr> + <td $colour align='center' colspan='13'> + <font color='#FFFFFF'>$Lang::tr{'policy'}: $message</font> + </td> + </tr> +END + } + + print "</table>"; + print "<br>"; + + &Header::closebox(); } + +&Header::closebigbox(); +&Header::closepage(); diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi index aab2d3d..6683ca8 100755 --- a/html/cgi-bin/p2p-block.cgi +++ b/html/cgi-bin/p2p-block.cgi @@ -32,6 +32,7 @@ require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl";
my $errormessage = ''; +my $notice; my $p2pfile = "${General::swroot}/firewall/p2protocols";
my @p2ps = (); @@ -44,8 +45,6 @@ my %mainsettings = ();
&Header::showhttpheaders(); &Header::getcgihash(%fwdfwsettings); -&Header::openpage($Lang::tr{'p2p block'}, 1, ''); -&Header::openbigbox('100%', 'center', $errormessage);
if ($fwdfwsettings{'ACTION'} eq 'togglep2p') { open( FILE, "<$p2pfile") or die "Unable to read $p2pfile"; @@ -66,77 +65,83 @@ if ($fwdfwsettings{'ACTION'} eq 'togglep2p') { close FILE;
&General::firewall_config_changed(); - &p2pblock(); -} else { - &p2pblock(); + + $notice = $Lang::tr{'p2p block save notice'}; }
-sub p2pblock { - my $gif; +&Header::openpage($Lang::tr{'p2p block'}, 1, ''); +&Header::openbigbox('100%', 'center', $errormessage);
- open(FILE, "<$p2pfile") or die "Unable to read $p2pfile"; - @p2ps = <FILE>; - close FILE; +if ($notice) { + &Header::openbox('100%', 'left', $Lang::tr{'notice'}); + print "<font class='base'>$notice</font>"; + &Header::closebox(); +}
- &Header::openbox('100%', 'center', $Lang::tr{'p2p block'}); - print <<END; - <table width='35%' border='0'> - <tr bgcolor='$color{'color22'}'> - <td align=center colspan='2' > - <b>$Lang::tr{'protocol'}</b> - </td> - <td align='center'> - <b>$Lang::tr{'status'}</b> - </td> - </tr> +my $gif; + +open(FILE, "<$p2pfile") or die "Unable to read $p2pfile"; +@p2ps = <FILE>; +close FILE; + +&Header::openbox('100%', 'center', $Lang::tr{'p2p block'}); +print <<END; + <table width='35%' border='0'> + <tr bgcolor='$color{'color22'}'> + <td align=center colspan='2' > + <b>$Lang::tr{'protocol'}</b> + </td> + <td align='center'> + <b>$Lang::tr{'status'}</b> + </td> + </tr> END
- foreach my $p2pentry (sort @p2ps) { - my @p2pline = split( /;/, $p2pentry); - if ($p2pline[2] eq 'on') { - $gif = "/images/on.gif" - } else { - $gif = "/images/off.gif" - } - - print <<END; - <tr bgcolor='$color{'color20'}'> - <td align='center' colspan='2'> - $p2pline[0]: - </td> - <td align='center'> - <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='hidden' name='P2PROT' value='$p2pline[1]'> - <input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;'> - <input type='hidden' name='ACTION' value='togglep2p'> - </form> - </td> - </tr> -END +foreach my $p2pentry (sort @p2ps) { + my @p2pline = split( /;/, $p2pentry); + if ($p2pline[2] eq 'on') { + $gif = "/images/on.gif" + } else { + $gif = "/images/off.gif" }
print <<END; - <tr> - <td> - <img src='/images/on.gif'> - </td> - <td> - $Lang::tr{'outgoing firewall p2p allow'} - </td> - </tr> - <tr> - <td> - <img src='/images/off.gif'> - </td> - <td> - $Lang::tr{'outgoing firewall p2p deny'} - </td> - </tr> - </table> + <tr bgcolor='$color{'color20'}'> + <td align='center' colspan='2'> + $p2pline[0]: + </td> + <td align='center'> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='hidden' name='P2PROT' value='$p2pline[1]'> + <input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;'> + <input type='hidden' name='ACTION' value='togglep2p'> + </form> + </td> + </tr> END - - &Header::closebox(); }
+print <<END; + <tr> + <td> + <img src='/images/on.gif'> + </td> + <td> + $Lang::tr{'outgoing firewall p2p allow'} + </td> + </tr> + <tr> + <td> + <img src='/images/off.gif'> + </td> + <td> + $Lang::tr{'outgoing firewall p2p deny'} + </td> + </tr> + </table> +END + +&Header::closebox(); + &Header::closebigbox(); &Header::closepage(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 92847ca..af8851f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -617,6 +617,7 @@ 'december' => 'Dezember', 'deep scan directories' => 'rekursiv scannen', 'def lease time' => 'Standardzeit für Zuordnung', +'default ip' => 'Standard IP-Adresse', 'default lease time' => 'Haltezeit-Voreinstellung in min:', 'default networks' => 'Standard Netzwerke', 'default renewal time' => 'Standard-Aktualisierungszeit', @@ -696,6 +697,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', '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.', @@ -879,6 +881,7 @@ 'firewall logs' => 'Firewall-Logdateien', 'firewall logs ip' => 'Fw-Logdiagramme (IP)', 'firewall logs port' => 'Fw-Logdiagramme (Port)', +'firewall rules' => 'Firewallregeln', 'firewallhits' => 'Firewalltreffer', 'firmware' => 'Firmware', 'firmware upload' => 'Hochladen der Firmware/Treiber', @@ -949,7 +952,9 @@ 'fwdfw from' => 'Von:', 'fwdfw hint ip1' => 'Die zuletzt erzeugte Regel mag eventuell niemals zutreffen, da sich Quelle und Ziel überlappen.', 'fwdfw hint ip2' => 'Bitte überprüfen Sie, ob diese Regel Sinn macht: ', +'fwdfw iface' => 'Interface', 'fwdfw ipsec network' => 'IPsec-Netzwerke:', +'fwdfw log' => 'Log', 'fwdfw log rule' => 'Logging aktivieren', 'fwdfw man port' => 'Port(s):', 'fwdfw menu' => 'Firewallregeln', @@ -1487,6 +1492,7 @@ 'not present' => '<B>Nicht</B> vorhanden', 'not running' => 'nicht gestartet', 'not set' => 'nicht gesetzt', +'notice' => 'Hinweis', 'november' => 'November', 'ntp common settings' => 'Allgemeine Einstellungen', 'ntp configuration' => 'NTP-Konfiguration', @@ -1609,6 +1615,7 @@ 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', 'p2p block' => 'P2P-Block', +'p2p block save notice' => 'Bitte lesen Sie die Firewallregeln neu ein, damit die Änderungen aktiv werden.', 'package failed to install' => 'Programmpaket konnte nicht installiert werden.', 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.', 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?', @@ -1856,6 +1863,7 @@ 'smbstop' => 'Samba Dienste beenden', 'smtphost' => 'Smtp Host', 'smtpport' => 'Smtp Port', +'snat new source ip address' => 'Neue Quell-IP-Adresse', 'snort hits' => 'Gesamtanzahl der aktivierten Intrusion-Regeln für', 'snort working' => 'Snort führt gerade eine Aufgabe aus... Bitte warten Sie, bis diese erfolgreich beendet wurde.', 'socket options' => 'Socket Options', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 2d36cdb..bdb66fa 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -638,6 +638,7 @@ 'december' => 'December', 'deep scan directories' => 'Scan recursive', 'def lease time' => 'Default Lease Time', +'default ip' => 'Default IP address', 'default lease time' => 'Default lease time (mins):', 'default networks' => 'Default networks', 'default renewal time' => 'Default Renewal Time', @@ -719,6 +720,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', '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.', @@ -904,6 +906,7 @@ 'firewall logs' => 'Firewall Logs', 'firewall logs ip' => 'Fw-Loggraphs (IP)', 'firewall logs port' => 'Fw-Loggraphs (Port)', +'firewall rules' => 'Firewall Rules', 'firewallhits' => 'firewallhits', 'firmware' => 'Firmware', 'firmware upload' => 'Upload Firmware/Drivers', @@ -974,7 +977,9 @@ 'fwdfw from' => 'From:', 'fwdfw hint ip1' => 'The last generated rule may never match, because source and destination subnets may overlap.', 'fwdfw hint ip2' => 'Please double-check if this rule makes sense: ', +'fwdfw iface' => 'Interface', 'fwdfw ipsec network' => 'IPsec networks:', +'fwdfw log' => 'Log', 'fwdfw log rule' => 'Log rule', 'fwdfw man port' => 'Port(s):', 'fwdfw menu' => 'Firewall Rules', @@ -1516,6 +1521,7 @@ 'not running' => 'not running', 'not set' => 'not set', 'notes' => 'Notes', +'notice' => 'Notice', 'november' => 'November', 'ntp common settings' => 'Common settings', 'ntp configuration' => 'NTP configuration', @@ -1638,6 +1644,7 @@ 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', 'p2p block' => 'P2P block', +'p2p block save notice' => 'Please reload the firewall ruleset in order to apply your changes.', 'package failed to install' => 'Package failed to install.', 'pagerefresh' => 'Page is beeing refreshed, please wait.', 'pakfire accept all' => 'Do you want to install all packages?', @@ -1890,6 +1897,7 @@ 'smbstop' => 'Stop samba', 'smtphost' => 'SMTP host', 'smtpport' => 'SMTP port', +'snat new source ip address' => 'New source IP address', 'snort hits' => 'Total of number of Intrusion rules activated for', 'snort working' => 'Snort is working ... Please wait until all operations have completed successfully.', 'socket options' => 'Socket options',
hooks/post-receive -- IPFire 2.x development tree