diff options
| author | Renato Botelho <renato@netgate.com> | 2015-12-21 10:28:45 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-12-21 10:28:45 -0200 |
| commit | 3bd905893f4eeb15485783e49a8ea2af14b31f4e (patch) | |
| tree | b7e105af89a0c05a187bd6ba3a860902a2469ee3 /config/pfblockerng/pfblockerng_update.php | |
| parent | 26c1744f34d378b9408023a894825fce9d8c4dc5 (diff) | |
| parent | 47649151b8856ede50c22f4d1f7f26e8866c5e69 (diff) | |
| download | pfsense-packages-RELENG_2_2_6.tar.gz pfsense-packages-RELENG_2_2_6.tar.bz2 pfsense-packages-RELENG_2_2_6.zip | |
Merge pull request #1223 from BBcan177/pfBNG-12-19-15-1RELENG_2_2_6
Diffstat (limited to 'config/pfblockerng/pfblockerng_update.php')
| -rw-r--r-- | config/pfblockerng/pfblockerng_update.php | 7 |
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\">   Active pfBlockerNG CRON Job </span></font> "; 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> |