[PATCH v2 5/8] ipblacklist: WUI menus, language file etc

[Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>]

[-- Attachment #1: Type: text/plain, Size: 4255 bytes --]

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