summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-01-04 09:32:12 +0545
committerStephen Beaver <sbeaver@netgate.com>2016-01-04 08:01:16 -0500
commit85560dbb639c26d01e61effec4301082f8f3eba9 (patch)
tree9c4507c0ba3e45a9c88e17686658fd27864432a0 /src/usr
parentdeff3aedc1dcb47719cad8224d1aeed68c514ad6 (diff)
downloadpfsense-85560dbb639c26d01e61effec4301082f8f3eba9.zip
pfsense-85560dbb639c26d01e61effec4301082f8f3eba9.tar.gz
Redmine #5731 Error when setting various system log settings from factory default config
Forum https://forum.pfsense.org/index.php?topic=104762.0
Diffstat (limited to 'src/usr')
-rwxr-xr-xsrc/usr/local/www/status_logs.php4
-rw-r--r--src/usr/local/www/status_logs_filter.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php
index 4a1ff52..adf5ecc 100755
--- a/src/usr/local/www/status_logs.php
+++ b/src/usr/local/www/status_logs.php
@@ -191,7 +191,9 @@ if ($save_settings) {
if (!$input_errors) {
# Clear out the specific log settings and leave only the applied settings to override the general logging options (global) settings.
- unset($config['syslog'][$specific_log]);
+ if (isset($config['syslog'][$specific_log])) {
+ unset($config['syslog'][$specific_log]);
+ }
# All
if ($cronorder != '') { # if not using the general logging options setting (global)
diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php
index 132c76b..cd3117e 100644
--- a/src/usr/local/www/status_logs_filter.php
+++ b/src/usr/local/www/status_logs_filter.php
@@ -213,7 +213,9 @@ if ($save_settings) {
if (!$input_errors) {
# Clear out the specific log settings and leave only the applied settings to override the general logging options (global) settings.
- unset($config['syslog'][$specific_log]);
+ if (isset($config['syslog'][$specific_log])) {
+ unset($config['syslog'][$specific_log]);
+ }
# All
if ($cronorder != '') { # if not using the general logging options setting (global)
OpenPOWER on IntegriCloud