Fixing Issue #110

Syslog Alerts cause DB errors

Author: TheWitness

README.md

@@ -164,6 +164,8 @@ that.
 
 * issue#109: Should merge CVE-2020-7106 solution to syslog plugin
 
+* issue#110: Syslog Alerts cause DB errors
+
 * issue: Massive performance improvement in statistics page rendering
 
 --- 2.5 ---

functions.php

@@ -730,7 +730,7 @@ function syslog_log_alert($alert_id, $alert_name, $severity, $msg, $count = 1, $
 		$save['seq']         = '';
 		$save['alert_id']    = $alert_id;
 		$save['logseq']      = $msg['seq'];
-		$save['logtime']     = $msg['date'] . ' ' . $msg['time'];
+		$save['logtime']     = $msg['logtime'];
 		$save['logmsg']      = db_qstr($msg['message']);
 		$save['host']        = $msg['host'];
 		$save['facility_id'] = $msg['facility_id'];

syslog_process.php

@@ -388,14 +388,14 @@
 							if ($alert['method'] == 0) $alertm  = $alerth;
 							$alertm .= "-----------------------------------------------\n";
 							$alertm .= __('Hostname:', 'syslog') . ' ' . html_escape($a['host']) . "\n";
-							$alertm .= __('Date:', 'syslog')     . ' ' . $a['date'] . ' ' . $a['time'] . "\n";
+							$alertm .= __('Date:', 'syslog')     . ' ' . $a['logtime'] . "\n";
 							$alertm .= __('Severity:', 'syslog') . ' ' . $severities[$alert['severity']] . "\n\n";
 							$alertm .= __('Level:', 'syslog')    . ' ' . $syslog_levels[$a['priority_id']] . "\n\n";
 							$alertm .= __('Message:', 'syslog')  . ' ' . "\n" . html_escape($a['message']) . "\n";
 
 							if ($alert['method'] == 0) $htmlm   = $htmlh;
 							$htmlm  .= '<tr><td>' . $a['host']                        . '</td>';
-							$htmlm  .= '<td>'     . $a['date'] . ' ' . $a['time']     . '</td>';
+							$htmlm  .= '<td>'     . $a['logtime']                     . '</td>';
 							$htmlm  .= '<td>'     . $severities[$alert['severity']]   . '</td>';
 							$htmlm  .= '<td>'     . $syslog_levels[$a['priority_id']] . '</td>';
 							$htmlm  .= '<td>'     . html_escape($a['message']) . '</td></tr>';
@@ -410,8 +410,8 @@
 								$ignore = syslog_db_fetch_cell('SELECT count(*)
 									FROM syslog_logs
 									WHERE alert_id=' . $alert['id'] . "
-									AND logtime>'$date'
-									AND host='" . $a['host'] . "'");
+									AND logtime > '$date'
+									AND host = " . db_qstr($a['host']));
 							}
 
 							if (!$ignore) {