aboutsummaryrefslogtreecommitdiffstats
path: root/config/pfblockerng/pfblockerng.inc
diff options
context:
space:
mode:
authorBBcan177 <bbcan177@gmail.com>2015-02-16 22:54:35 -0500
committerBBcan177 <bbcan177@gmail.com>2015-02-16 22:54:35 -0500
commitb9d81c4f46607ef54c62925b3cccb9e3479a6fa4 (patch)
treec4dfc7f67978add49ad125ec9dc4f894954246da /config/pfblockerng/pfblockerng.inc
parent5710913b9b14034d6abd7754dd2b85537e9dcf2f (diff)
downloadpfsense-packages-b9d81c4f46607ef54c62925b3cccb9e3479a6fa4.tar.gz
pfsense-packages-b9d81c4f46607ef54c62925b3cccb9e3479a6fa4.tar.bz2
pfsense-packages-b9d81c4f46607ef54c62925b3cccb9e3479a6fa4.zip
pfBlockerNG - Mods to inc file.
Move the unlink_if_exists outside of the if statement, as it needs to be called independently.
Diffstat (limited to 'config/pfblockerng/pfblockerng.inc')
-rw-r--r--config/pfblockerng/pfblockerng.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc
index 3db5b07b..78622631 100644
--- a/config/pfblockerng/pfblockerng.inc
+++ b/config/pfblockerng/pfblockerng.inc
@@ -364,12 +364,12 @@ function pfb_aliastables($mode) {
}
}
else {
- // Remove earlyshellcmd if found.
+ // Remove Aliastables archive and earlyshellcmd if found.
+ @unlink_if_exists("{$pfb['aliasarchive']}");
if (is_array($config['system']['earlyshellcmd'])) {
$a_earlyshellcmd = &$config['system']['earlyshellcmd'];
if (preg_grep("/pfblockerng.sh aliastables/", $a_earlyshellcmd)) {
$a_earlyshellcmd = preg_grep("/pfblockerng.sh aliastables/", $a_earlyshellcmd, PREG_GREP_INVERT);
- @unlink_if_exists("{$pfb['aliasarchive']}");
$msg = "\n** Removing earlyshellcmd **\n";
}
}
@@ -2459,12 +2459,12 @@ function pfblockerng_php_deinstall_command() {
rmdir_recursive("{$pfb['dbdir']}");
rmdir_recursive("{$pfb['logdir']}");
- // Remove earlyshellcmd if found.
+ // Remove Aliastables archive and earlyshellcmd if found.
+ @unlink_if_exists("{$pfb['aliasarchive']}");
if (is_array($config['system']['earlyshellcmd'])) {
$a_earlyshellcmd = &$config['system']['earlyshellcmd'];
if (preg_grep("/pfblockerng.sh aliastables/", $a_earlyshellcmd)) {
$a_earlyshellcmd = preg_grep("/pfblockerng.sh aliastables/", $a_earlyshellcmd, PREG_GREP_INVERT);
- @unlink_if_exists("{$pfb['aliasarchive']}");
}
}