From 14421b9e9165ce9c1618c9a310aec0f24ea48491 Mon Sep 17 00:00:00 2001 From: BBcan177 Date: Thu, 5 Feb 2015 23:36:10 -0500 Subject: pfBlockerNG - Remove previously used cc folder reference - Missed removing the /cc folder reference in pfblockerng.xml. No Version bump is required as this is only required for new installations. The countrycodes.tar.bz2 file is provided as a backup in case the user has a download failure from MaxMind Inc. Website. --- config/pfblockerng/pfblockerng.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config/pfblockerng/pfblockerng.inc') diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc index 0eb3ff43..793bf7a4 100644 --- a/config/pfblockerng/pfblockerng.inc +++ b/config/pfblockerng/pfblockerng.inc @@ -2343,7 +2343,8 @@ function pfblockerng_php_install_command() { @rmdir_recursive("{$pfb['dbdir']}/cc"); # Uncompress Country Code File and delete Archive after extraction. - exec("cd /{$pfb['ccdir']}; /usr/bin/tar -jxvf {$pfb['ccdir']}/countrycodes.tar.bz2"); + @rename("{$pfb['dbdir']}/countrycodes.tar.bz2", "{$pfb['ccdir']}/countrycodes.tar.bz2"); + exec("cd {$pfb['ccdir']}; /usr/bin/tar -jxvf {$pfb['ccdir']}/countrycodes.tar.bz2"); unlink_if_exists("{$pfb['ccdir']}/countrycodes.tar.bz2"); # Download MaxMind Files and Create Country Code files and Build Continent XML Files update_output_window(gettext("Downloading MaxMind Country Databases. This may take a minute...")); -- cgit v1.2.3