From abd86da5d1e3212fb4403b1f4cf2a5c6b4789897 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Tue, 25 Oct 2011 13:41:07 +0200 Subject: [PATCH 1/2] Fixed bug in syslog summary report missing checksum in report generation --- src/classes/reports/report.syslog.syslogsummary.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/classes/reports/report.syslog.syslogsummary.class.php b/src/classes/reports/report.syslog.syslogsummary.class.php index 95b8e2c..65386d7 100644 --- a/src/classes/reports/report.syslog.syslogsummary.class.php +++ b/src/classes/reports/report.syslog.syslogsummary.class.php @@ -336,8 +336,11 @@ class Report_syslogsummary extends Report { $logArray[MISC_CHECKSUM] = crc32( $logArray[SYSLOG_MESSAGE] ); // Maybe useful somewhere else: sprintf( "%u", crc32 ( $logArray[SYSLOG_MESSAGE] )); $strChecksum = $logArray[MISC_CHECKSUM]; - // TODO, save calculated Checksum into DB! + // Save calculated Checksum into DB! + $this->_streamObj->SaveMessageChecksum($logArray); } + else // Get checksum + $strChecksum = $logArray[MISC_CHECKSUM]; // Check if entry exists in result array if ( isset($content["report_consdata"][ $logArray[SYSLOG_HOST] ]['cons_msgs'][ $strChecksum ]) ) From 6dbf4e4a6967f3767e99655adf35819512042e36 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Tue, 25 Oct 2011 13:52:35 +0200 Subject: [PATCH 2/2] Fixed bug in preparing filters for display in basic report class --- src/classes/reports/report.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/classes/reports/report.class.php b/src/classes/reports/report.class.php index 7409ce7..75c3e6e 100644 --- a/src/classes/reports/report.class.php +++ b/src/classes/reports/report.class.php @@ -399,7 +399,7 @@ abstract class Report { $aNewDisplayFilter['FilterType'] = $content['LN_REPORT_FILTERTYPE_STRING']; // Set Filterdisplay - $aNewDisplayFilter['FilterDisplay'] .= $aNewDisplayFilter['FilterCaption'] . " "; + $aNewDisplayFilter['FilterDisplay'] = $aNewDisplayFilter['FilterCaption'] . " "; if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_INCLUDE ) { if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_SEARCHFULL ) @@ -421,7 +421,7 @@ abstract class Report { $aNewDisplayFilter['FilterType'] = $content['LN_REPORT_FILTERTYPE_NUMBER']; // Set Filterdisplay - $aNewDisplayFilter['FilterDisplay'] .= $aNewDisplayFilter['FilterCaption'] . " "; + $aNewDisplayFilter['FilterDisplay'] = $aNewDisplayFilter['FilterCaption'] . " "; if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_INCLUDE ) $aNewDisplayFilter['FilterDisplay'] .= "== " . $tmpFilter[FILTER_VALUE]; else if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_EXCLUDE )