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-07 12:48:35 +02:00
commit a967533cf7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/classes/logstream.class.php
View File

@ -598,11 +598,12 @@ abstract class LogStream {
if ( isset($szFilters) && strlen($szFilters) > 0 ) if ( isset($szFilters) && strlen($szFilters) > 0 )
{ {
//OLD $tmpEntries = explode(" ", $szFilters); //OLD $tmpEntries = explode(" ", $szFilters);
// Use RegEx for intelligent splitting // 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); $tmpEntries = preg_split($szFilterRgx, $szFilters, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
//DEBUG print_r ( $tmpEntries ); //DEBUG print_r ( $tmpEntries );
foreach($tmpEntries as $myEntry) foreach($tmpEntries as $myEntry)
{ {
// Continue if empty filter! // Continue if empty filter!