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

Fixed bug when excluding more then one string filter from the same field type

Browse Source
This commit is contained in:
Andre Lorbach 2008-09-26 16:23:59 +02:00
parent c9e40ae86a
commit 5b8ac830f5
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/classes/logstreamdisk.class.php
View File

@ -758,11 +758,13 @@ class LogStreamDisk extends LogStream {
// Otherwise we use OR Handling!
else
{
$bIsOrFilter = true; // Set isOrFilter to true
// Include Filter
if ( $myfilter[FILTER_MODE] & FILTER_MODE_INCLUDE )
{
// Set isOrFilter to true in this case
$bIsOrFilter = true;
if ( $myfilter[FILTER_MODE] & FILTER_MODE_SEARCHFULL )
{
if ( strtolower($propertyvalue) == strtolower($myfilter[FILTER_VALUE]) )
@ -774,18 +776,20 @@ class LogStreamDisk extends LogStream {
$bOrFilter = true;
}
}
// Exclude Filter
// Exclude Filter - handeled with AND filtering!
else if ( $myfilter[FILTER_MODE] & FILTER_MODE_EXCLUDE )
{
if ( $myfilter[FILTER_MODE] & FILTER_MODE_SEARCHFULL )
{
if ( strtolower($propertyvalue) != strtolower($myfilter[FILTER_VALUE]) )
$bOrFilter = true;
// if ( strtolower($propertyvalue) != strtolower($myfilter[FILTER_VALUE]) )
if ( strtolower($propertyvalue) == strtolower($myfilter[FILTER_VALUE]) )
$bEval = false;
}
else
{
if ( stripos($propertyvalue, $myfilter[FILTER_VALUE]) === false )
$bOrFilter = true;
// if ( stripos($propertyvalue, $myfilter[FILTER_VALUE]) === false )
if ( stripos($propertyvalue, $myfilter[FILTER_VALUE]) !== false )
$bEval = false;
}
}
break;