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

Fixed filter edit handling in report admin, which was broken because of changes in last version

Browse Source
This commit is contained in:
Andre Lorbach 2011-10-26 16:13:02 +02:00
parent 9b95b35c81
commit b488be53a1
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/admin/reports.php
View File

@ -589,9 +589,9 @@ if ( isset($content['ISADDSAVEDREPORT']) && $content['ISADDSAVEDREPORT'] )
$szFilterString = ""; $szFilterString = "";
if ( if (
( strlen($content['filterString']) <= 0 && // ( strlen($content['filterString']) <= 0 &&
isset($_POST['report_filterString']) ) // isset($_POST['report_filterString']) )
|| // ||
( strlen($content['filterString']) > 0 && ( strlen($content['filterString']) > 0 &&
!isset($_POST['subop']) && !isset($_POST['subop']) &&
!isset($_POST['subop_edit']) && !isset($_POST['subop_edit']) &&
@ -739,10 +739,20 @@ if ( isset($content['ISADDSAVEDREPORT']) && $content['ISADDSAVEDREPORT'] )
$i++; $i++;
} }
// DEBUG stuff // Reset Allfilters Array to NULL in this case!
// echo $content['filterString'] . "<br>\r\n"; if ( strlen($szFilterString) <= 0 )
// echo $szFilterString . "<br>\r\n"; {
// print_r ( $AllFilters ); $content['filterString'] = "";
$content['filterString_htmlform'] = "";
}
/*
// DEBUG stuff
echo $content['filterString'] . "<br>\r\n";
echo $szFilterString . "<br>\r\n";
print_r ( $AllFilters );
// */
} }
} }
@ -796,7 +806,10 @@ if ( isset($content['ISADDSAVEDREPORT']) && $content['ISADDSAVEDREPORT'] )
} }
// Copy Final Filterstring if necessary // Copy Final Filterstring if necessary
if ( strlen($szFilterString) > 0 ) if ( strlen($szFilterString) > 0 )
{
$content['filterString'] = $szFilterString; $content['filterString'] = $szFilterString;
$content['filterString_htmlform'] = htmlspecialchars($szFilterString);
}
// echo $content['SourceID']; // echo $content['SourceID'];
if ( isset($content['Sources'][$content['SourceID']]['ObjRef']) ) if ( isset($content['Sources'][$content['SourceID']]['ObjRef']) )