aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbmeeks8 <bmeeks8@bellsouth.net>2014-10-10 16:11:28 -0400
committerbmeeks8 <bmeeks8@bellsouth.net>2014-12-15 12:11:59 -0500
commit8cfa82037d2e5dc2801e798961e305233c19ba89 (patch)
treea9872438e73f001286a469c01ef92057abb741d1
parentc2b4378b69a890cc479e179bf5dac0e61c7f7692 (diff)
downloadpfsense-packages-8cfa82037d2e5dc2801e798961e305233c19ba89.tar.gz
pfsense-packages-8cfa82037d2e5dc2801e798961e305233c19ba89.tar.bz2
pfsense-packages-8cfa82037d2e5dc2801e798961e305233c19ba89.zip
Do not lose any set custom update time when rule updates are disabled.
-rw-r--r--config/suricata/suricata_global.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/config/suricata/suricata_global.php b/config/suricata/suricata_global.php
index f2a24fcf..0696ceac 100644
--- a/config/suricata/suricata_global.php
+++ b/config/suricata/suricata_global.php
@@ -140,12 +140,14 @@ if (!$input_errors) {
$config['installedpackages']['suricata']['config'][0]['autoruleupdate'] = $_POST['autoruleupdate'];
/* Check and adjust format of Rule Update Starttime string to add colon and leading zero if necessary */
- $pos = strpos($_POST['autoruleupdatetime'], ":");
- if ($pos === false) {
- $tmp = str_pad($_POST['autoruleupdatetime'], 4, "0", STR_PAD_LEFT);
- $_POST['autoruleupdatetime'] = substr($tmp, 0, 2) . ":" . substr($tmp, -2);
+ if ($_POST['autoruleupdatetime']) {
+ $pos = strpos($_POST['autoruleupdatetime'], ":");
+ if ($pos === false) {
+ $tmp = str_pad($_POST['autoruleupdatetime'], 4, "0", STR_PAD_LEFT);
+ $_POST['autoruleupdatetime'] = substr($tmp, 0, 2) . ":" . substr($tmp, -2);
+ }
+ $config['installedpackages']['suricata']['config'][0]['autoruleupdatetime'] = str_pad($_POST['autoruleupdatetime'], 4, "0", STR_PAD_LEFT);
}
- $config['installedpackages']['suricata']['config'][0]['autoruleupdatetime'] = str_pad($_POST['autoruleupdatetime'], 4, "0", STR_PAD_LEFT);
$config['installedpackages']['suricata']['config'][0]['log_to_systemlog'] = $_POST['log_to_systemlog'] ? 'on' : 'off';
$config['installedpackages']['suricata']['config'][0]['log_to_systemlog_facility'] = $_POST['log_to_systemlog_facility'];
$config['installedpackages']['suricata']['config'][0]['live_swap_updates'] = $_POST['live_swap_updates'] ? 'on' : 'off';