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

Fixed editing issues in report filter editor

Browse Source
This commit is contained in:
Andre Lorbach 2010-03-19 18:16:02 +01:00
parent 1c414717e8
commit f3b68e49fe
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/admin/reports.php
View File

@ -462,8 +462,6 @@ if ( isset($_GET['op']) )
$content['cronCommand'] = CreateCronCommand( $content['ReportID'], $content['SavedReportID'] ); $content['cronCommand'] = CreateCronCommand( $content['ReportID'], $content['SavedReportID'] );
// Other settings ... TODO! // Other settings ... TODO!
// $content['customFilters'] = "";
// $content['outputTarget'] = "";
$content['scheduleSettings'] = ""; $content['scheduleSettings'] = "";
} }
else else
@ -589,16 +587,20 @@ if ( isset($content['ISADDSAVEDREPORT']) && $content['ISADDSAVEDREPORT'] )
// Init Filterstring variable // Init Filterstring variable
$szFilterString = ""; $szFilterString = "";
if ( (strlen($content['filterString']) > 0 && isset($_POST['filterString'])) && $content['filterString'] != $_POST['filterString'] ) if ( strlen($content['filterString']) > 0 &&
!isset($_POST['subop']) &&
!isset($_POST['subop_edit']) &&
!isset($_POST['subop_delete']) &&
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']);
} }
else else
{ {
// Process POST data! // Process POST data!
if ( isset($_POST['Filters']) ) if ( isset($_POST['Filters']) )
{ {
// Get Filter array // Get Filter array
$AllFilters = $_POST['Filters']; $AllFilters = $_POST['Filters'];
@ -926,7 +928,6 @@ if ( isset($content['ISADDSAVEDREPORT']) && $content['ISADDSAVEDREPORT'] )
} }
// Handle POST requests // Handle POST requests
if ( isset($_POST['op']) ) if ( isset($_POST['op']) )
{ {
@ -947,7 +948,14 @@ if ( isset($_POST['op']) )
if ( isset($_POST['SourceID']) ) { $content['SourceID'] = DB_RemoveBadChars($_POST['SourceID']); } if ( isset($_POST['SourceID']) ) { $content['SourceID'] = DB_RemoveBadChars($_POST['SourceID']); }
if ( isset($_POST['report_customtitle']) ) { $content['customTitle'] = DB_RemoveBadChars($_POST['report_customtitle']); } else {$content['report_customtitle'] = ""; } if ( isset($_POST['report_customtitle']) ) { $content['customTitle'] = DB_RemoveBadChars($_POST['report_customtitle']); } else {$content['report_customtitle'] = ""; }
if ( isset($_POST['report_customcomment']) ) { $content['customComment'] = DB_RemoveBadChars($_POST['report_customcomment']); } else {$content['report_customcomment'] = ""; } if ( isset($_POST['report_customcomment']) ) { $content['customComment'] = DB_RemoveBadChars($_POST['report_customcomment']); } else {$content['report_customcomment'] = ""; }
if ( isset($_POST['report_filterString']) ) { $content['filterString'] = DB_RemoveBadChars($_POST['report_filterString']); } else {$content['report_filterString'] = ""; }
// if ( isset($_POST['report_filterString']) ) { $content['filterString'] = DB_RemoveBadChars($_POST['report_filterString']); } else {$content['report_filterString'] = ""; }
//echo $szFilterString . "!" . $content['filterString'];
//exit;
if ( isset($_POST['outputFormat']) ) { $content['outputFormat'] = DB_RemoveBadChars($_POST['outputFormat']); } if ( isset($_POST['outputFormat']) ) { $content['outputFormat'] = DB_RemoveBadChars($_POST['outputFormat']); }
if ( isset($_POST['outputTarget']) ) { $content['outputTarget'] = DB_RemoveBadChars($_POST['outputTarget']); } if ( isset($_POST['outputTarget']) ) { $content['outputTarget'] = DB_RemoveBadChars($_POST['outputTarget']); }
if ( isset($_POST['outputTarget_filename']) ) { $content['outputTarget_filename'] = DB_RemoveBadChars($_POST['outputTarget_filename']); } if ( isset($_POST['outputTarget_filename']) ) { $content['outputTarget_filename'] = DB_RemoveBadChars($_POST['outputTarget_filename']); }