Skip to content

Commit

Permalink
Update pfblockerng_install.inc
Browse files Browse the repository at this point in the history
* Add missing $g global setting.
* Adjust Installation messages to suit new pkg installation code.
* Remove '-cgi' from php command, causing issues with max_execution_time
  • Loading branch information
BBcan177 committed Dec 13, 2015
1 parent 67264b6 commit 1dacf0f
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ require_once('pfsense-utils.inc');
require_once('/usr/local/pkg/pfblockerng/pfblockerng.inc');
require_once('/usr/local/www/pfblockerng/pfblockerng.php');

global $config, $pfb;
global $config, $g, $pfb;
set_language($config['system']['language']);
pfb_global();

Expand Down Expand Up @@ -135,18 +135,18 @@ else {
update_status("\nMaxMind Country databases previously downloaded.\n");
}

update_status("Converting MaxMind Country databases for pfBlockerNG.\n This may take a few minutes...");
update_status("Converting MaxMind Country databases for pfBlockerNG.\n This may take a few minutes...\n");
pfblockerng_uc_countries();
update_status(" done.\nCreating pfBlockerNG Continent XML files...");
update_status("Creating pfBlockerNG Continent XML files...\n");
pfblockerng_get_countries();

if ($pfb['keep'] == 'on' && isset($pfb['widgets']) && strpos($pfb['widgets'], 'pfblockerng-container') !== FALSE) {
update_status(" done.\nRestoring previous pfBlockerNG Widget settings...");
update_status("Restoring previous pfBlockerNG Widget settings...");
// Restore previous widget setting if 'keep' is enabled.
$config['widgets']['sequence'] = $pfb['widgets'];
write_config('pfBlockerNG: Save widget');
} else {
update_status(" done.\nAdding pfBlockerNG Widget to the Dashboard...");
update_status("Adding pfBlockerNG Widget to the Dashboard...");
$widgets = $config['widgets']['sequence'];
if (strpos($widgets, 'pfblockerng-container') === FALSE) {
if (empty($widgets)) {
Expand Down Expand Up @@ -180,7 +180,7 @@ $rc['start'] = <<<EOF
fi
# Start DNSBL HTTPS Daemon
/usr/local/bin/php-cgi -f /usr/local/pkg/pfblockerng/pfblockerng.inc dnsbl &
/usr/local/bin/php -f /usr/local/pkg/pfblockerng/pfblockerng.inc dnsbl &
EOF;

Expand Down

0 comments on commit 1dacf0f

Please sign in to comment.