aboutsummaryrefslogtreecommitdiffstats
path: root/config/pfblockerng
diff options
context:
space:
mode:
authorBBcan177 <bbcan177@gmail.com>2015-12-19 14:35:48 -0500
committerBBcan177 <bbcan177@gmail.com>2015-12-19 14:35:48 -0500
commit0ee88ec87e2cb940c1b023a0fb62eda8d4fae1ee (patch)
treeea32cee539c91a49dcc427bf2abbf9dd16afe5de /config/pfblockerng
parent8255a0f1a740cb76934afa704c07d9268bfdbb3e (diff)
downloadpfsense-packages-0ee88ec87e2cb940c1b023a0fb62eda8d4fae1ee.tar.gz
pfsense-packages-0ee88ec87e2cb940c1b023a0fb62eda8d4fae1ee.tar.bz2
pfsense-packages-0ee88ec87e2cb940c1b023a0fb62eda8d4fae1ee.zip
Update pfblockerng_update.php
* Add Header() * Improve query for active pfBNG running tasks
Diffstat (limited to 'config/pfblockerng')
-rw-r--r--config/pfblockerng/pfblockerng_update.php7
1 files changed, 4 insertions, 3 deletions
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>