tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-25 18:59:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3-stable' into beta

Browse Source
This commit is contained in:
Andre Lorbach 2011-10-25 13:53:31 +02:00
commit 0ca9204246
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/classes/reports/report.class.php
View File

@ -399,7 +399,7 @@ abstract class Report {
$aNewDisplayFilter['FilterType'] = $content['LN_REPORT_FILTERTYPE_STRING']; $aNewDisplayFilter['FilterType'] = $content['LN_REPORT_FILTERTYPE_STRING'];
// Set Filterdisplay // Set Filterdisplay
$aNewDisplayFilter['FilterDisplay'] .= $aNewDisplayFilter['FilterCaption'] . " "; $aNewDisplayFilter['FilterDisplay'] = $aNewDisplayFilter['FilterCaption'] . " ";
if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_INCLUDE ) if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_INCLUDE )
{ {
if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_SEARCHFULL ) if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_SEARCHFULL )
@ -421,7 +421,7 @@ abstract class Report {
$aNewDisplayFilter['FilterType'] = $content['LN_REPORT_FILTERTYPE_NUMBER']; $aNewDisplayFilter['FilterType'] = $content['LN_REPORT_FILTERTYPE_NUMBER'];
// Set Filterdisplay // Set Filterdisplay
$aNewDisplayFilter['FilterDisplay'] .= $aNewDisplayFilter['FilterCaption'] . " "; $aNewDisplayFilter['FilterDisplay'] = $aNewDisplayFilter['FilterCaption'] . " ";
if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_INCLUDE ) if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_INCLUDE )
$aNewDisplayFilter['FilterDisplay'] .= "== " . $tmpFilter[FILTER_VALUE]; $aNewDisplayFilter['FilterDisplay'] .= "== " . $tmpFilter[FILTER_VALUE];
else if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_EXCLUDE ) else if ( $tmpFilter[FILTER_MODE] & FILTER_MODE_EXCLUDE )