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

Added code to read custom filters from form data and store into DB

Browse Source
This commit is contained in:
Andre Lorbach 2009-12-02 17:02:47 +01:00
parent 1d5e00a104
commit ac54dc1d28
3 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/admin/reports.php
View File

@ -395,7 +395,7 @@ if ( isset($_GET['op']) )
CreateOutputformatList( $content['outputFormat'] );
// Other settings ... TODO!
$content['customFilters'] = "";
// $content['customFilters'] = "";
$content['outputTarget'] = "";
$content['scheduleSettings'] = "";
}
@ -829,10 +829,29 @@ if ( isset($_POST['op']) )
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['outputFormat']) ) { $content['outputFormat'] = DB_RemoveBadChars($_POST['outputFormat']); }
// Read Custom Filters
foreach ( $content['CUSTOMFILTERS'] as &$tmpCustomFilter )
{
// Set fieldvalue if available from POST data
if ( isset($_POST[ $tmpCustomFilter['fieldname'] ]) ) { $tmpCustomFilter['fieldvalue'] = DB_RemoveBadChars($_POST[ $tmpCustomFilter['fieldname'] ]); }
}
// Read done, now build "customFilters" string!
$content['customFilters'] = "";
foreach ( $content['CUSTOMFILTERS'] as $tmpCustomFilter )
{
// Append comma if necessary
if (strlen($content['customFilters']) > 0)
$content['customFilters'] .= ", ";
// Append customFilter!
$content['customFilters'] .= $tmpCustomFilter['fieldname'] . "=>" . $tmpCustomFilter['fieldvalue'];
}
// TODO!
// customFilters, outputTarget, scheduleSettings
$content['customFilters'] = "";
// $content['customFilters'] = "";
$content['outputTarget'] = "";
$content['scheduleSettings'] = "";
@ -857,7 +876,7 @@ if ( isset($_POST['op']) )
// --- Now Verify Report Source!
// Create tmpSavedReport!
$tmpSavedReport["SavedReportID"] = $content['customFilters'];
$tmpSavedReport["SavedReportID"] = 0;
$tmpSavedReport["sourceid"] = $content['SourceID'];
$tmpSavedReport["customTitle"] = $content['customTitle'];
$tmpSavedReport["customComment"] = $content['customComment'];
@ -1048,12 +1067,32 @@ function InitCustomFilterDefinitions($myReport, $CustomFilterValues)
// Include Custom language file if available
$myReportObj->InitReportLanguageFile( $myReportObj->GetReportIncludePath() );
// Parse and Split CustomFilterValues
if ( strlen($CustomFilterValues) > 0 )
{
$tmpFilterValues = explode( ",", $CustomFilterValues );
//Loop through mappings
foreach ($tmpFilterValues as &$myFilterValue )
{
// Split subvalues
$tmpArray = explode( "=>", $myFilterValue );
// Set into temporary array
$tmpfilterid = trim($tmpArray[0]);
$myFilterValues[$tmpfilterid] = trim($tmpArray[1]);
}
}
// Loop through filters
$i = 0; // Help counter!
foreach( $customFilterDefs as $filterID => $tmpCustomFilter )
{
// TODO Check if value is available in $CustomFilterValues
$szDefaultValue = $tmpCustomFilter['DefaultValue'];
// Check if value is available in $CustomFilterValues
if ( isset($myFilterValues[$filterID]) )
$szDefaultValue = $myFilterValues[$filterID];
else
$szDefaultValue = $tmpCustomFilter['DefaultValue'];
// TODO Check MIN and MAX value!
@ -1065,6 +1104,7 @@ function InitCustomFilterDefinitions($myReport, $CustomFilterValues)
$i++;
// ---
// Add to Display Array of custom filters!
$content['CUSTOMFILTERS'][] = array (
'fieldname' => $filterID,
'fieldcaption' => $content[ $tmpCustomFilter['DisplayLangID'] ],

4
src/classes/reports/report.class.php
View File

@ -235,8 +235,8 @@ abstract class Report {
// Set new Outputtype
$this->_customFilters = $newAdvancedOptions;
echo "TODO SetCustomFilters";
exit;
// echo "TODO SetCustomFilters";
// exit;
}
/*

2
src/templates/admin/admin_reports.html
View File

@ -224,7 +224,7 @@
<b>{fieldcaption}</b><br/>(<I>{fielddescription}</I>)
</td>
<td align="left" class="{colcssclass}" width="200">
<input type="text" name="fieldname" size="40" maxlength="255" value="{fieldvalue}">
<input type="text" name="{fieldname}" size="40" maxlength="255" value="{fieldvalue}">
</td>
</tr>
<!-- END CUSTOMFILTERS -->