diff --git a/INFO b/INFO index 9b4bf4d..2471cda 100644 --- a/INFO +++ b/INFO @@ -1,6 +1,6 @@ [info] name = syslog -version = 2.5 +version = 2.6 longname = Syslog Monitoring author = The Cacti Group email = diff --git a/README.md b/README.md index a2131c2..c0cd9ce 100644 --- a/README.md +++ b/README.md @@ -155,13 +155,15 @@ that. ## ChangeLog ---- develop --- +--- 2.6 --- * issue#104: When filtering, syslog incorrectly thinks the Cacti hosts table does not exist * issue#107: Removal rule not using correct DB when using $use_cacti_db = false; +* issue#109: Should merge CVE-2020-7106 solution to syslog plugin + * issue: Massive performance improvement in statistics page rendering --- 2.5 --- diff --git a/syslog.php b/syslog.php index 05c6d38..dc4b925 100644 --- a/syslog.php +++ b/syslog.php @@ -986,9 +986,9 @@ function syslog_filter($sql_where, $tab) { $unprocessed = syslog_db_fetch_cell("SELECT COUNT(*) FROM `" . $syslogdb_default . "`.`syslog_incoming`"); if (isset_request_var('date1')) { - $filter_text = __(' [ Start: \'%s\' to End: \'%s\', Unprocessed Messages: %s ]', get_request_var('date1'), get_request_var('date2'), $unprocessed, 'syslog'); + $filter_text = __esc(' [ Start: \'%s\' to End: \'%s\', Unprocessed Messages: %s ]', get_request_var('date1'), get_request_var('date2'), $unprocessed, 'syslog'); } else { - $filter_text = __('[ Unprocessed Messages: %s ]', $unprocessed, 'syslog'); + $filter_text = __esc('[ Unprocessed Messages: %s ]', $unprocessed, 'syslog'); } ?>