Skip to content

Commit f0ae274

Browse files
committed
Fixing Issue #109
* Should merge CVE-2020-7106 solution to syslog plugin * Preparing for release
1 parent 61ca677 commit f0ae274

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

INFO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[info]
22
name = syslog
3-
version = 2.5
3+
version = 2.6
44
longname = Syslog Monitoring
55
author = The Cacti Group
66
email =

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,15 @@ that.
155155

156156
## ChangeLog
157157

158-
--- develop ---
158+
--- 2.6 ---
159159

160160
* issue#104: When filtering, syslog incorrectly thinks the Cacti hosts table
161161
does not exist
162162

163163
* issue#107: Removal rule not using correct DB when using $use_cacti_db = false;
164164

165+
* issue#109: Should merge CVE-2020-7106 solution to syslog plugin
166+
165167
* issue: Massive performance improvement in statistics page rendering
166168

167169
--- 2.5 ---

syslog.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -986,9 +986,9 @@ function syslog_filter($sql_where, $tab) {
986986
$unprocessed = syslog_db_fetch_cell("SELECT COUNT(*) FROM `" . $syslogdb_default . "`.`syslog_incoming`");
987987

988988
if (isset_request_var('date1')) {
989-
$filter_text = __(' [ Start: \'%s\' to End: \'%s\', Unprocessed Messages: %s ]', get_request_var('date1'), get_request_var('date2'), $unprocessed, 'syslog');
989+
$filter_text = __esc(' [ Start: \'%s\' to End: \'%s\', Unprocessed Messages: %s ]', get_request_var('date1'), get_request_var('date2'), $unprocessed, 'syslog');
990990
} else {
991-
$filter_text = __('[ Unprocessed Messages: %s ]', $unprocessed, 'syslog');
991+
$filter_text = __esc('[ Unprocessed Messages: %s ]', $unprocessed, 'syslog');
992992
}
993993

994994
?>

0 commit comments

Comments
 (0)