diff options
| author | Renato Botelho <renato@netgate.com> | 2015-12-14 09:51:31 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-12-14 09:51:31 -0200 |
| commit | 4f0db58132b8aeeb483b31b3f35b7fae98b63316 (patch) | |
| tree | 3e1bd5d9693663ffd2b73407332d150bc220f7b4 /config/pfblockerng/pfblockerng.php | |
| parent | dcc68137b44ee8f82f4e71f6650fc1cec5fd8c6b (diff) | |
| parent | 4939d54bb30757e6274ce73324dd9adf546b3541 (diff) | |
| download | pfsense-packages-4f0db58132b8aeeb483b31b3f35b7fae98b63316.tar.gz pfsense-packages-4f0db58132b8aeeb483b31b3f35b7fae98b63316.tar.bz2 pfsense-packages-4f0db58132b8aeeb483b31b3f35b7fae98b63316.zip | |
Merge pull request #1217 from BBcan177/pfBlockerNG_12-13-15-1
Diffstat (limited to 'config/pfblockerng/pfblockerng.php')
| -rw-r--r-- | config/pfblockerng/pfblockerng.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/pfblockerng/pfblockerng.php b/config/pfblockerng/pfblockerng.php index 8a368d2e..c88e85a5 100644 --- a/config/pfblockerng/pfblockerng.php +++ b/config/pfblockerng/pfblockerng.php @@ -47,7 +47,7 @@ require_once('services.inc'); require_once('/usr/local/pkg/pfblockerng/pfblockerng.inc'); require_once('/usr/local/pkg/pfblockerng/pfblockerng_extra.inc'); // 'include functions' not yet merged into pfSense -global $config, $pfb; +global $config, $g, $pfb; // Extras - MaxMind/Alexa Download URLs/filenames/settings $pfb['extras'][0]['url'] = 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz'; @@ -406,7 +406,7 @@ function pfblockerng_sync_cron() { // Function to process the downloaded MaxMind database and format into Continent txt files. function pfblockerng_uc_countries() { - global $pfb; + global $g, $pfb; $maxmind_cont = "{$pfb['geoipshare']}/country_continent.csv"; $maxmind_cc4 = "{$pfb['geoipshare']}/GeoIPCountryWhois.csv"; @@ -564,7 +564,7 @@ function pfblockerng_uc_countries() { // Function to process Continent txt files and create Country ISO files and to Generate GUI XML files. function pfblockerng_get_countries() { - global $pfb; + global $g, $pfb; $files = array ( 'Africa' => "{$pfb['ccdir']}/Africa_v4.txt", 'Asia' => "{$pfb['ccdir']}/Asia_v4.txt", |