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

Report admin, the custom filterstring was not saved if new report was created

Browse Source
This commit is contained in:
Andre Lorbach 2011-09-21 16:35:12 +02:00
parent 895f0fe321
commit 951deadd13
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -21,6 +21,8 @@ Version 3.2.2 (stable), ????-??-??
-"Search for this" // Excludes full phrase -"Search for this" // Excludes full phrase
- Report admin, fixed filter editor issues when full phrase strings - Report admin, fixed filter editor issues when full phrase strings
(with spaces) were configured. (with spaces) were configured.
- Report admin, the custom filterstring was not saved if new report
was created or the previous custom filterstring was empty.
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Version 3.2.1 (stable), 2011-04-12 Version 3.2.1 (stable), 2011-04-12
- Fixed timezone parsing in GetEventTime function. This caused problems - Fixed timezone parsing in GetEventTime function. This caused problems

10
src/admin/reports.php
View File

@ -589,11 +589,17 @@ if ( isset($content['ISADDSAVEDREPORT']) && $content['ISADDSAVEDREPORT'] )
// Init Filterstring variable // Init Filterstring variable
$szFilterString = ""; $szFilterString = "";
if ( strlen($content['filterString']) > 0 && if (
( strlen($content['filterString']) <= 0 &&
isset($_POST['report_filterString']) )
||
( strlen($content['filterString']) > 0 &&
!isset($_POST['subop']) && !isset($_POST['subop']) &&
!isset($_POST['subop_edit']) && !isset($_POST['subop_edit']) &&
!isset($_POST['subop_delete']) && !isset($_POST['subop_delete']) &&
isset($_POST['report_filterString']) && $content['filterString'] != $_POST['report_filterString'] ) ( isset($_POST['report_filterString']) && $content['filterString'] != $_POST['report_filterString'] )
)
)
{ {
// Overwrite filterString from form data instead of filter array! // Overwrite filterString from form data instead of filter array!
$content['filterString'] = DB_RemoveBadChars($_POST['report_filterString']); $content['filterString'] = DB_RemoveBadChars($_POST['report_filterString']);