From 7c72eb8617c3ba3d1e55f118d8fd04ed98bef8ad Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 4 Dec 2015 12:18:54 +0100 Subject: Fix check so that Alexa list is not downloaded when disabled --- config/pfblockerng/pfblockerng.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/pfblockerng/pfblockerng.php b/config/pfblockerng/pfblockerng.php index d71fdff8..8a368d2e 100644 --- a/config/pfblockerng/pfblockerng.php +++ b/config/pfblockerng/pfblockerng.php @@ -108,7 +108,7 @@ if (in_array($argv[1], array('update', 'updateip', 'updatednsbl', 'dc', 'bu', 'u } // Skip Alexa update, if disabled - if ($pfb['dnsbl_alexa'] == 'Disabled') { + if ($pfb['dnsbl_alexa'] != 'on') { unset($pfb['extras'][5]); } @@ -1547,4 +1547,4 @@ EOF; // Unset arrays unset ($roptions4, $et_options, $xmlrep); } -?> \ No newline at end of file +?> -- cgit v1.2.3 From 3fa5e6c4d7c580e8efce6f5e498dce46d7a43cd7 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 4 Dec 2015 13:06:03 +0100 Subject: Add missing variable to pfb_global() --- config/pfblockerng/pfblockerng.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc index 69e010d3..c0e81b27 100644 --- a/config/pfblockerng/pfblockerng.inc +++ b/config/pfblockerng/pfblockerng.inc @@ -200,6 +200,7 @@ function pfb_global() { $pfb['dnsbl'] = $pfb['dnsblconfig']['pfb_dnsbl']; // Enabled state of DNSBL $pfb['dnsbl_port'] = $pfb['dnsblconfig']['pfb_dnsport'] ?: ''; // Lighttpd web server http port setting $pfb['dnsbl_port_ssl'] = $pfb['dnsblconfig']['pfb_dnsport_ssl']?: ''; // Lighttpd web server https port setting + $pfb['dnsbl_alexa'] = $pfb['dnsblconfig']['alexa_enable']; // Alexa whitelist // Restore previous download on failure (default to 'on') $pfb['restore'] = $pfb['config']['restore_feed'] != '' ? $pfb['config']['restore_feed'] : 'on'; -- cgit v1.2.3