diff --git a/src/etc/inc/plugins.inc.d/webgui.inc b/src/etc/inc/plugins.inc.d/webgui.inc index 124681e60..72a78d421 100644 --- a/src/etc/inc/plugins.inc.d/webgui.inc +++ b/src/etc/inc/plugins.inc.d/webgui.inc @@ -216,7 +216,7 @@ EOD; $lighty_port = $port; $lighty_use_syslog = ''; - if (!isset($config['syslog']['nologlighttpd'])) { + if (empty($config['syslog']['nologlighttpd'])) { $lighty_use_syslog = << - - - - /> - - - - /> diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php index 6c9187127..83a32883c 100644 --- a/src/www/system_advanced_admin.php +++ b/src/www/system_advanced_admin.php @@ -78,6 +78,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $pconfig['quietlogin'] = isset($config['system']['webgui']['quietlogin']); $pconfig['deployment'] = $config['system']['deployment'] ?? ''; + /* XXX not really a syslog setting */ + $pconfig['loglighttpd'] = empty($config['syslog']['nologlighttpd']); + /* XXX listtag "fun" */ $pconfig['sshlogingroup'] = !empty($config['system']['ssh']['group'][0]) ? $config['system']['ssh']['group'][0] : null; } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') { @@ -157,10 +160,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $config['system']['webgui']['compression'] != $pconfig['compression'] || $config['system']['webgui']['ssl-ciphers'] != $newciphers || $config['system']['webgui']['interfaces'] != $newinterfaces || - (empty($pconfig['httpaccesslog'])) != empty($config['system']['webgui']['httpaccesslog']) || - (empty($pconfig['ssl-hsts'])) != empty($config['system']['webgui']['ssl-hsts']) || + empty($pconfig['httpaccesslog']) != empty($config['system']['webgui']['httpaccesslog']) || + empty($pconfig['ssl-hsts']) != empty($config['system']['webgui']['ssl-hsts']) || !empty($pconfig['disablehttpredirect']) != !empty($config['system']['webgui']['disablehttpredirect']) || - ($config['system']['deployment'] ?? '') != $pconfig['deployment']; + ($config['system']['deployment'] ?? '') != $pconfig['deployment'] || + !empty($config['syslog']['nologlighttpd']) != empty($pconfig['loglighttpd']); $config['system']['webgui']['protocol'] = $pconfig['webguiproto']; $config['system']['webgui']['port'] = $pconfig['webguiport']; @@ -168,6 +172,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $config['system']['webgui']['ssl-ciphers'] = $newciphers; $config['system']['webgui']['interfaces'] = $newinterfaces; $config['system']['webgui']['compression'] = $pconfig['compression']; + $config['syslog']['nologlighttpd'] = empty($pconfig['loglighttpd']); if (!empty($pconfig['deployment'])) { $config['system']['deployment'] = $pconfig['deployment']; @@ -690,6 +695,16 @@ $(document).ready(function() { + + + + /> + + + +