summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2012-08-29 17:25:58 +0000
committerErmal <eri@pfsense.org>2012-08-29 17:28:51 +0000
commit56178d9a78bcf4fd44b13d6ed6f54fa4afb68841 (patch)
tree872140d36c6999e0f6e24f27d3edf55513900743 /etc
parent58d9e380a7a5a8300dfea5fd0eb363cc45a61b0e (diff)
downloadpfsense-56178d9a78bcf4fd44b13d6ed6f54fa4afb68841.zip
pfsense-56178d9a78bcf4fd44b13d6ed6f54fa4afb68841.tar.gz
Correct filter tdr install_cron function
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/filter.inc21
1 files changed, 10 insertions, 11 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index ee5b1ab..c5a8f70 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2935,14 +2935,15 @@ function filter_tdr_install_cron($should_install) {
if($g['booting']==true)
return;
- $is_installed = false;
-
- if(!$config['cron']['item'])
- return;
+ if (!is_array($config['cron']))
+ $config['cron'] = array();
+ if (!is_array($config['cron']['item']))
+ $config['cron']['item'] = array();
$x=0;
+ $is_installed = false;
foreach($config['cron']['item'] as $item) {
- if(strstr($item['command'], "filter_configure_sync")) {
+ if (strstr($item['command'], "filter_configure_sync")) {
$is_installed = true;
break;
}
@@ -2951,7 +2952,7 @@ function filter_tdr_install_cron($should_install) {
switch($should_install) {
case true:
- if(!$is_installed) {
+ if (!$is_installed) {
$cron_item = array();
$cron_item['minute'] = "0,15,30,45";
$cron_item['hour'] = "*";
@@ -2966,11 +2967,9 @@ function filter_tdr_install_cron($should_install) {
}
break;
case false:
- if($is_installed == true) {
- if($x > 0) {
- unset($config['cron']['item'][$x]);
- write_config();
- }
+ if ($is_installed == true) {
+ unset($config['cron']['item'][$x]);
+ write_config(gettext("Removed 15 minute filter reload for Time Based Rules"));
configure_cron();
}
break;
OpenPOWER on IntegriCloud