mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a potential source of PHP errors when saving per-log settings. Fixes #9540

Browse Source 
While here, fix save descriptions.

(cherry picked from commit 303641f828)
This commit is contained in:
jim-p 2019-05-20 11:35:35 -04:00
parent 3f45cc99ff
commit 057d15dca8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/usr/local/www/status_logs_common.inc
View File

@ -583,11 +583,12 @@ function manage_log_code() {
return;
}
global $logfile, $specific_log, $config, $pconfig, $save_settings, $input_errors, $extra_save_msg, $retval, $changes_applied;
global $logfile, $specific_log, $config, $pconfig, $save_settings, $input_errors, $extra_save_msg, $retval, $changes_applied, $allowed_logs;
$changes_applied = false;
$extra_save_msg = "";
$specific_log = basename($logfile) . '_settings';
init_config_arr(array('syslog', $specific_log));
// Common to All Logs
$pconfig['cronorder'] = isset($config['syslog'][$specific_log]['cronorder']) ? $config['syslog'][$specific_log]['cronorder'] : "forward";
@ -719,11 +720,12 @@ function manage_log_code() {
$changes_applied = true;
// If any of the logging settings were changed then backup and sync (standard write_config). Otherwise only write config (don't backup, don't sync).
$log_friendly_name = empty($allowed_logs[$logfile]["name"]) ? $logfile : $allowed_logs[$logfile]["name"];
if ($logging_changed) {
write_config($desc = gettext("Log Display Settings Saved: ") . gettext($allowed_logs[$logfile]["name"]), $backup = true, $write_config_only = false);
write_config($desc = gettext("Log Display Settings Saved: ") . gettext($log_friendly_name), $backup = true, $write_config_only = false);
system_syslogd_start();
} else {
write_config($desc = gettext("Log Display Settings Saved (no backup, no sync): ") . gettext($allowed_logs[$logfile]["name"]), $backup = false, $write_config_only = true);
write_config($desc = gettext("Log Display Settings Saved (no backup, no sync): ") . gettext($log_friendly_name), $backup = false, $write_config_only = true);
}
// Specific to System General (main) Log