aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/pfblockerng/pfblockerng.inc11
-rw-r--r--config/pfblockerng/pfblockerng_log.php10
2 files changed, 2 insertions, 19 deletions
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc
index 69baceeb..d59a8f3a 100644
--- a/config/pfblockerng/pfblockerng.inc
+++ b/config/pfblockerng/pfblockerng.inc
@@ -2279,8 +2279,6 @@ function pfblockerng_php_deinstall_command() {
# Set these two variables to Disable pfBlockerNG on De-Install
$pfb['save'] = TRUE;
$pfb['install'] = TRUE;
- pfb_global();
-
sync_package_pfblockerng();
rmdir_recursive("/usr/local/pkg/pfblockerng");
rmdir_recursive("/usr/local/www/pfblockerng");
@@ -2320,15 +2318,6 @@ function pfblockerng_php_deinstall_command() {
unset($config['installedpackages']['pfblockerngsouthamerica']);
if (is_array($config['installedpackages']['pfblockerngtopspammers']))
unset($config['installedpackages']['pfblockerngtopspammers']);
-
- # Remove any pfBlockerNG Aliastable Files
- $pfb_files = glob("{$pfb['aliasdir']}/pfB_*.txt");
- if (!empty($pfb_files)) {
- foreach ($pfb_files as $pfb_list) {
- $pfb_file = basename($pfb_list, ".txt");
- unlink_if_exists("{$pfb_file}.txt");
- }
- }
}
# Remove Widget (code from Snort deinstall)
diff --git a/config/pfblockerng/pfblockerng_log.php b/config/pfblockerng/pfblockerng_log.php
index fc452032..339daca0 100644
--- a/config/pfblockerng/pfblockerng_log.php
+++ b/config/pfblockerng/pfblockerng_log.php
@@ -181,15 +181,9 @@ if (isset($_POST['file'])) {
if (isset($_POST['logFile'])) {
$s_logfile = $_POST['logFile'];
- # Clear log
+ # Clear selected file
if (isset($_POST['clear'])) {
- if (is_file($s_logfile)) {
- # Only allow clearing of 'log' files
- $ext = pathinfo($s_logfile, PATHINFO_EXTENSION);
- if ($ext == "log") {
- unlink_if_exists($s_logfile);
- }
- }
+ unlink_if_exists($s_logfile);
}
# Download log