From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
To: development@lists.ipfire.org
Subject: [PATCH v2 5/8] ipblacklist: WUI menus, language file etc
Date: Mon, 27 Apr 2020 15:31:20 +0100
Message-ID: <20200427143123.6378-6-ipfr@tfitzgeorge.me.uk>
In-Reply-To: <20200427143123.6378-1-ipfr@tfitzgeorge.me.uk>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8645649810267062171=="
List-Id: <development.lists.ipfire.org>

--===============8645649810267062171==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk>
---
 config/menu/50-firewall.menu  |  5 +++++
 config/menu/70-log.menu       |  5 +++++
 html/cgi-bin/logs.cgi/log.dat |  2 ++
 langs/en/cgi-bin/en.pl        | 27 ++++++++++++++++++++++++++-
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index 5ec1f67fc..3cfcde835 100644
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -21,6 +21,11 @@
                                 'title' =3D> "$Lang::tr{'intrusion detection=
 system'}",
 				'enabled' =3D> 1,
                                 };
+	$subfirewall->{'45.ipblacklist'} =3D {'caption' =3D> $Lang::tr{'ipblacklist=
'},
+				'uri' =3D> '/cgi-bin/ipblacklist.cgi',
+				'title' =3D> "$Lang::tr{'ipblacklist'}",
+				'enabled' =3D> 1,
+				};
 	$subfirewall->{'50.p2p'} =3D {
 				'caption' =3D> $Lang::tr{'p2p block'},
 				'uri' =3D> '/cgi-bin/p2p-block.cgi',
diff --git a/config/menu/70-log.menu b/config/menu/70-log.menu
index 08973de5a..67bbecc1a 100644
--- a/config/menu/70-log.menu
+++ b/config/menu/70-log.menu
@@ -43,6 +43,11 @@
 				'title' =3D> "$Lang::tr{'ids logs'}",
 				'enabled' =3D> 1
 				};
+    $sublogs->{'55.ipblacklist'} =3D {'caption' =3D> $Lang::tr{'ipblacklist =
logs'},
+				'uri' =3D> '/cgi-bin/logs.cgi/ipblacklists.dat',
+				'title' =3D> "$Lang::tr{'ipblacklist logs'}",
+				'enabled' =3D> 1
+				};
     $sublogs->{'60.urlfilter'} =3D {
 				'caption' =3D> $Lang::tr{'urlfilter logs'},
 				'uri' =3D> '/cgi-bin/logs.cgi/urlfilter.dat',
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 8ca32d675..ba1a482c8 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -59,6 +59,7 @@ my %sections =3D (
         'dhcp' =3D> '(dhcpd: )',
         'dma' =3D> '(dma: |dma\[.*\]: |postfix/\w*\[\d*\]: )',
         'guardian' =3D> '(guardian\[.*\]: )',
+        'ipblacklist' =3D> '(ipblacklist: )',
         'ipfire' =3D> '(ipfire: )',
         'ipsec' =3D> '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
         'kernel' =3D> '(kernel: (?!DROP_))',
@@ -87,6 +88,7 @@ my %trsections =3D (
         'dhcp' =3D> "$Lang::tr{'dhcp server'}",
         'dma' =3D> 'Mail',
         'guardian' =3D> "$Lang::tr{'guardian'}",
+        'ipblacklist' =3D> "$Lang::tr{'ipblacklist'}",
         'ipfire' =3D> 'IPFire',
         'ipsec' =3D> 'IPSec',
         'kernel' =3D> "$Lang::tr{'kernel'}",
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 3f3e46641..57f52fa48 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1,4 +1,4 @@
-%tr =3D (=20
+%tr =3D (
 %tr,
=20
 '24 hours' =3D> '24 Hours',
@@ -1534,6 +1534,31 @@
 'ip alias changed' =3D> 'External IP alias changed',
 'ip alias removed' =3D> 'External IP alias removed',
 'ip info' =3D> 'IP Information',
+'ipblacklist' =3D> 'IP Address Blacklists',
+'ipblacklist blacklist settings' =3D> 'Blacklist settings',
+'ipblacklist category' =3D> 'Category',
+'ipblacklist category application' =3D> 'Application',
+'ipblacklist category attacker' =3D> 'Attacker',
+'ipblacklist category c and c' =3D> 'Malware C&amp;C',
+'ipblacklist category composite' =3D> 'Composite',
+'ipblacklist category invalid' =3D> 'Invalid Address',
+'ipblacklist category reputation' =3D> 'Reputation',
+'ipblacklist category scanner' =3D> 'Scanner',
+'ipblacklist disable mid' =3D> 'because it is included in',
+'ipblacklist disable post' =3D> '',
+'ipblacklist disable pre' =3D> 'Disabling',
+'ipblacklist enable' =3D> 'Enable',
+'ipblacklist entries' =3D> 'Entries',
+'ipblacklist hits' =3D> 'Total number of blacklist hits for',
+'ipblacklist id' =3D> 'Blacklist',
+'ipblacklist input' =3D> 'Packets Dropped In',
+'ipblacklist log list' =3D> 'Firewall log (blacklist)',
+'ipblacklist log' =3D> 'Log dropped packets',
+'ipblacklist logs' =3D> 'IP Address Blacklist Logs',
+'ipblacklist name' =3D> 'Name',
+'ipblacklist output' =3D> 'Packets Dropped Out',
+'ipblacklist use ipblacklists' =3D> 'Enable IP Blacklists',
+'ipblacklist working' =3D> 'Updating IP address blacklists...',
 'ipfire has now rebooted' =3D> 'IPFire is rebooting now.',
 'ipfire has now shutdown' =3D> 'IPFire is shutting down now.',
 'ipfire side' =3D> 'IPFire side:',
--=20
2.16.4


--===============8645649810267062171==--