From 1184f93488f9f6a67a5d40d332bb32a2fccd584c Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Fri, 7 Oct 2011 12:45:34 +0200 Subject: [PATCH] Fixed internal Filter parsing bug introduced in 3.2.2 Some filters, like generated by reports were not parsed correctly. This problem was introduced because of bug in the regex rules for splitting filters. --- src/classes/logstream.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/classes/logstream.class.php b/src/classes/logstream.class.php index e04b405..ed5f65d 100644 --- a/src/classes/logstream.class.php +++ b/src/classes/logstream.class.php @@ -598,11 +598,12 @@ abstract class LogStream { if ( isset($szFilters) && strlen($szFilters) > 0 ) { -//OLD $tmpEntries = explode(" ", $szFilters); +//OLD $tmpEntries = explode(" ", $szFilters); // Use RegEx for intelligent splitting - $szFilterRgx = '/[,\s]++(?=(?:(?:[^"]*+"){2})*+[^"]*+$)(?=(?:(?:[^\']*+\'){2})*+[^\']*+$)(?=(?:[^()]*+\([^()]*+\))*+[^()]*+$)/x'; + $szFilterRgx = '/[\s]++(?=(?:(?:[^"]*+"){2})*+[^"]*+$)(?=(?:(?:[^\']*+\'){2})*+[^\']*+$)(?=(?:[^()]*+\([^()]*+\))*+[^()]*+$)/x'; $tmpEntries = preg_split($szFilterRgx, $szFilters, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE); //DEBUG print_r ( $tmpEntries ); + foreach($tmpEntries as $myEntry) { // Continue if empty filter!