From 23481ebcb529f8c47a72dc7121401971f9e68213 Mon Sep 17 00:00:00 2001 From: BBcan177 Date: Sun, 22 Nov 2015 20:30:01 -0500 Subject: pfBlockerNG - Minor fixes --- config/pfblockerng/pfblockerng.inc | 14 +++++++------- config/pfblockerng/pfblockerng.php | 18 +++++++++--------- config/pfblockerng/pfblockerng_dnsbl.xml | 4 ++-- config/pfblockerng/pfblockerng_v4lists.xml | 8 ++++---- config/pfblockerng/pfblockerng_v6lists.xml | 8 ++++---- 5 files changed, 26 insertions(+), 26 deletions(-) (limited to 'config/pfblockerng') diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc index 9ee253fd..7ddbb565 100644 --- a/config/pfblockerng/pfblockerng.inc +++ b/config/pfblockerng/pfblockerng.inc @@ -2360,7 +2360,7 @@ function sync_package_pfblockerng($cron='') { } if (!empty($list['custom'])) { - $list['row'][] = array( 'header' => "{$list['aliasname']}_custom", + $list['row'][] = array( 'header' => preg_replace("/\W/", '', $list['aliasname']) . '_custom', 'custom' => $list['custom'], 'state' => 'Enabled', 'update' => $list['custom_update'], @@ -2433,9 +2433,9 @@ function sync_package_pfblockerng($cron='') { if (file_exists("{$pfbfolder}/{$header}.txt") && $pfbreuse == '') { if ($row['state'] == 'Hold') { - $log = "\n[ {$header} ]{$logtab} Static Hold [ NOW ]"; + $log = "\n[ {$header} ]{$logtab} static hold. [ NOW ]"; } else { - $log = "\n[ {$header} ]{$logtab} exists, Reloading [ NOW ]"; + $log = "\n[ {$header} ]{$logtab} exists. [ NOW ]"; } pfb_logger("{$log}", 1); @@ -3135,7 +3135,7 @@ function sync_package_pfblockerng($cron='') { if ($continent === $continent_ex && !empty($pfctlck) && file_exists("{$pfbfolder}/{$ccfile}.txt") && $pfb['reuse'] == '') { if (!$pfb['save']) { - $log = "\n[ {$pfb_alias}{$vtype} ]{$logtab} exists, Reloading [ NOW ]"; + $log = "\n[ {$pfb_alias}{$vtype} ]{$logtab} exists. [ NOW ]"; pfb_logger("{$log}", 1); } } else { @@ -3252,7 +3252,7 @@ function sync_package_pfblockerng($cron='') { } if (!empty($list['custom'])) { - $list['row'][] = array( 'header' => "{$list['aliasname']}_custom", + $list['row'][] = array( 'header' => preg_replace("/\W/", '', $list['aliasname']) . '_custom', 'custom' => $list['custom'], 'state' => 'Enabled', 'update' => $list['custom_update'], @@ -3307,9 +3307,9 @@ function sync_package_pfblockerng($cron='') { if (file_exists("{$pfbfolder}/{$header}.txt") && $pfbreuse == '') { if ($row['state'] == 'Hold') { - $log = "\n[ {$header} ]{$logtab} Static Hold [ NOW ]"; + $log = "\n[ {$header} ]{$logtab} static hold. [ NOW ]"; } else { - $log = "\n[ {$header} ]{$logtab} exists, Reloading [ NOW ]"; + $log = "\n[ {$header} ]{$logtab} exists. [ NOW ]"; } pfb_logger("{$log}", 1); } else { diff --git a/config/pfblockerng/pfblockerng.php b/config/pfblockerng/pfblockerng.php index 93578f24..d71fdff8 100644 --- a/config/pfblockerng/pfblockerng.php +++ b/config/pfblockerng/pfblockerng.php @@ -55,30 +55,30 @@ $pfb['extras'][0]['file_dwn'] = 'GeoIP.dat.gz'; $pfb['extras'][0]['file'] = 'GeoIP.dat'; $pfb['extras'][0]['folder'] = "{$pfb['geoipshare']}"; -$pfb['extras'][1]['url'] = "http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz"; +$pfb['extras'][1]['url'] = 'http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz'; $pfb['extras'][1]['file_dwn'] = 'GeoIPv6.dat.gz'; $pfb['extras'][1]['file'] = 'GeoIPv6.dat'; $pfb['extras'][1]['folder'] = "{$pfb['geoipshare']}"; -$pfb['extras'][2]['url'] = "http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip"; +$pfb['extras'][2]['url'] = 'http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip'; $pfb['extras'][2]['file_dwn'] = 'GeoIPCountryCSV.zip'; $pfb['extras'][2]['file'] = 'GeoIPCountryWhois.csv'; $pfb['extras'][2]['folder'] = "{$pfb['geoipshare']}"; $pfb['extras'][2]['install'] = TRUE; // Flag for package installation -$pfb['extras'][3]['url'] = "http://dev.maxmind.com/static/csv/codes/country_continent.csv"; +$pfb['extras'][3]['url'] = 'http://dev.maxmind.com/static/csv/codes/country_continent.csv'; $pfb['extras'][3]['file_dwn'] = 'country_continent.csv'; $pfb['extras'][3]['file'] = 'country_continent.csv'; $pfb['extras'][3]['folder'] = "{$pfb['geoipshare']}"; $pfb['extras'][3]['install'] = TRUE; // Flag for package installation -$pfb['extras'][4]['url'] = "http://geolite.maxmind.com/download/geoip/database/GeoIPv6.csv.gz"; +$pfb['extras'][4]['url'] = 'http://geolite.maxmind.com/download/geoip/database/GeoIPv6.csv.gz'; $pfb['extras'][4]['file_dwn'] = 'GeoIPv6.csv.gz'; $pfb['extras'][4]['file'] = 'GeoIPv6.csv'; $pfb['extras'][4]['folder'] = "{$pfb['geoipshare']}"; $pfb['extras'][4]['install'] = TRUE; // Flag for package installation -$pfb['extras'][5]['url'] = "https://s3.amazonaws.com/alexa-static/top-1m.csv.zip"; +$pfb['extras'][5]['url'] = 'https://s3.amazonaws.com/alexa-static/top-1m.csv.zip'; $pfb['extras'][5]['file_dwn'] = 'top-1m.csv.zip'; $pfb['extras'][5]['file'] = 'top-1m.csv'; $pfb['extras'][5]['folder'] = "{$pfb['dbdir']}"; @@ -171,7 +171,7 @@ function pfb_update_check($header, $list_url, $pfbfolder, $pfborig, $pflex, $for // Check if List file doesn't exist or Format is 'whois'. if (!file_exists("{$pfbfolder}/{$header}.txt") || $format == 'whois') { - $log = "\t\t\t\t\t\t\tUpdate Found\n"; + $log = "\t\t\t\t\t\t\tUpdate found\n"; pfb_logger("{$log}", 1); $pfb['update_cron'] = TRUE; return; @@ -183,7 +183,7 @@ function pfb_update_check($header, $list_url, $pfbfolder, $pfborig, $pflex, $for // Compare previously downloaded file timestamp with remote timestamp if (file_exists($local_file)) { if ($format == 'rsync') { - $log = "\t\t\t\t( rsync )\t\tUpdate Found\n"; + $log = "\t\t\t\t( rsync )\t\tUpdate found\n"; pfb_logger("{$log}", 1); $pfb['update_cron'] = TRUE; unlink_if_exists("{$pfbfolder}/{$header}.txt"); @@ -234,7 +234,7 @@ function pfb_update_check($header, $list_url, $pfbfolder, $pfborig, $pflex, $for $local_md5 = @md5_file($local_file); if ($remote_md5 != $local_md5) { - $log = "\t\t\t\t( md5 changed )\t\tUpdate Found\n"; + $log = "\t\t\t\t( md5 changed )\t\tUpdate found\n"; pfb_logger("{$log}", 1); $pfb['update_cron'] = TRUE; unlink_if_exists("{$pfbfolder}/{$header}.txt"); @@ -271,7 +271,7 @@ function pfb_update_check($header, $list_url, $pfbfolder, $pfborig, $pflex, $for // Trigger CRON process if updates are found. $pfb['update_cron'] = TRUE; - $log = "Update Found\n"; + $log = "Update found\n"; pfb_logger("{$log}", 1); unlink_if_exists("{$pfbfolder}/{$header}.txt"); } diff --git a/config/pfblockerng/pfblockerng_dnsbl.xml b/config/pfblockerng/pfblockerng_dnsbl.xml index b6a09b62..250d2e12 100644 --- a/config/pfblockerng/pfblockerng_dnsbl.xml +++ b/config/pfblockerng/pfblockerng_dnsbl.xml @@ -389,7 +389,7 @@ Alexa TLD Inclusion alexa_inclusion - + Default: COM, NET, ORG, CA, CO, IO

Detailed listing : Root Zone top-level domains. ]]> @@ -565,7 +565,7 @@ suppression
Enter one   Domain Name  per line
- You may use "#" after any Domain name to add comments. example ( google.com # Suppress Google.com )
+ You may use "#" after any Domain name to add comments. example (google.com # Suppress Google.com)
This List is stored as 'Base64' format in the config.xml file.

Note: These entries are only suppressed when Feeds are downloaded or on a 'Force Reload'.
diff --git a/config/pfblockerng/pfblockerng_v4lists.xml b/config/pfblockerng/pfblockerng_v4lists.xml index 9ef3626b..24c8b279 100644 --- a/config/pfblockerng/pfblockerng_v4lists.xml +++ b/config/pfblockerng/pfblockerng_v4lists.xml @@ -146,7 +146,7 @@ Alias Name aliasname - + Do not include 'pfBlocker' or 'pfB_' in the Alias Name, it's done by package.
International, special or space characters will be ignored in firewall alias names.
]]> @@ -174,7 +174,7 @@
  • 'Country code': /usr/pbi/pfblockerng-amd64/share/GeoIP/cc/US_v4.txt  (Change 'US' to required code)
+  (Click for ASN Lookup) 'Header/Label': This field must be unique. This names the file and is referenced in the widget.  (ie: Spamhaus_drop, Spamhaus_edrop)

]]> @@ -439,8 +439,8 @@ info Note:  Custom List can be used in ONE of two ways:
-
    1. IPv4 addresses entered directly into the custom list, as per the required format.
-
    2. Domain names or AS numbers, which will be converted into their respective IPv4 addresses.
]]> +
    1. IPv4 addresses entered directly into the custom list, as per the required format. +
    2. Domain names or AS numbers, which will be converted into their respective IPv4 addresses.
]]> diff --git a/config/pfblockerng/pfblockerng_v6lists.xml b/config/pfblockerng/pfblockerng_v6lists.xml index e5f30caa..bc4c6bfa 100644 --- a/config/pfblockerng/pfblockerng_v6lists.xml +++ b/config/pfblockerng/pfblockerng_v6lists.xml @@ -145,7 +145,7 @@ Alias Name aliasname - + Do not include 'pfBlocker' or 'pfB_' in the Alias Name, it's done by package.
International, special or space characters will be ignored in firewall alias names.
]]> @@ -171,7 +171,7 @@
  • 'Country code': /usr/pbi/pfblockerng-amd64/share/GeoIP/cc/US_v6.txt  (Change 'US' to required code)
+  (Click for ASN Lookup) 'Header/Label': This field must be unique. This names the file and is referenced in the widget.  (ie: Spamhaus_drop, Spamhaus_edrop)

]]> @@ -433,8 +433,8 @@ info Note:  Custom List can be used in ONE of two ways:
-
    1. IPv6 addresses entered directly into the custom list, as per the required format.
-
    2. Domain names or AS numbers, which will be converted into their respective IPv6 addresses.
]]> +
    1. IPv6 addresses entered directly into the custom list, as per the required format. +
    2. Domain names or AS numbers, which will be converted into their respective IPv6 addresses.
]]> -- cgit v1.2.3