From 0ee88ec87e2cb940c1b023a0fb62eda8d4fae1ee Mon Sep 17 00:00:00 2001
From: BBcan177 <bbcan177@gmail.com>
Date: Sat, 19 Dec 2015 14:35:48 -0500
Subject: Update pfblockerng_update.php

* Add Header()
* Improve query for active pfBNG running tasks
---
 config/pfblockerng/pfblockerng_update.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'config/pfblockerng')

diff --git a/config/pfblockerng/pfblockerng_update.php b/config/pfblockerng/pfblockerng_update.php
index 8a04f843..a723dd5b 100644
--- a/config/pfblockerng/pfblockerng_update.php
+++ b/config/pfblockerng/pfblockerng_update.php
@@ -81,8 +81,9 @@ function pfb_cron_update($type) {
 
 	// Query for any active pfBlockerNG CRON jobs
 	exec('/bin/ps -wx', $result_cron);
-	if (preg_grep("/pfblockerng[.]php\s+?(cron|update)/", $result_cron)) {
+	if (preg_grep("/pfblockerng[.]php\s+?(cron|update|updatednsbl)/", $result_cron)) {
 		pfbupdate_status(gettext("Force {$type} Terminated - Failed due to Active Running Task. Click 'View' for running process"));
+		header('Location: /pfblockerng/pfblockerng_update.php');
 		exit;
 	}
 
@@ -254,7 +255,7 @@ include_once('fbegin.inc');
 
 					// Query for any active pfBlockerNG CRON jobs
 					exec('/bin/ps -wax', $result_cron);
-					if (preg_grep("/pfblockerng[.]php\s+?(cron|update)/", $result_cron)) {
+					if (preg_grep("/pfblockerng[.]php\s+?(cron|update|updatednsbl)/", $result_cron)) {
 						echo "<font size=\"2\"><span class=\"red\">&emsp;&emsp;
 							Active pfBlockerNG CRON Job </span></font>&emsp;";
 						echo "<img src = '/themes/{$g['theme']}/images/icons/icon_pass.gif' alt='' width='15' height='15'
@@ -372,4 +373,4 @@ if (isset($_POST['pfbreload']) && $pfb['enable'] == 'on') {
 ?>
 </form>
 </body>
-</html>
\ No newline at end of file
+</html>
-- 
cgit v1.2.3