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

Continued coding reportgenerator

Browse Source
This commit is contained in:
Andre Lorbach 2009-11-04 13:29:25 +01:00
parent f3daa04f1c
commit 8910347d04
3 changed files with 81 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lang/en/main.php
View File

@ -335,6 +335,7 @@ $content['LN_ORACLE_ONLINESEARCH'] = "Online Search";
$content['LN_ORACLE_WHOIS'] = "WHOIS Lookup for '%1' value '%2'";
$content['LN_GEN_ERROR_INVALIDOP'] = "Invalid or missing operation type";
$content['LN_GEN_ERROR_INVALIDREPORTID'] = "Invalid or missing report id";
$content['LN_GEN_ERROR_MISSINGSAVEDREPORTID'] = "Invalid or missing savedreport id";

96
src/reportgenerator.php
View File

@ -61,6 +61,14 @@ else
$content['error_details'] = $content['LN_GEN_ERROR_INVALIDOP'];
}
if ( isset($_GET['reportid']) )
$content['reportid'] = DB_RemoveBadChars($_GET['reportid']);
else
{
$content['error_occured'] = "error";
$content['error_details'] = $content['LN_GEN_ERROR_INVALIDREPORTID'];
}
if ( isset($_GET['savedreportid']) )
{
// read and verify value
@ -139,6 +147,69 @@ $content['TITLE'] = InitPageTitle();
// Get data and print on the image!
if ( !$content['error_occured'] )
{
// Check if report exists
if ( isset($content['REPORTS'][ $content['reportid'] ]) )
{
// Get Reference to parser!
$myReport = $content['REPORTS'][ $content['reportid'] ];
// Now check if the saved report is available
if ( isset($myReport['SAVEDREPORTS']) && count($myReport['SAVEDREPORTS']) > 0 )
{
// Init SavedReport reference
$mySavedReport = null;
// Saved reports available, search for our one!
foreach ($myReport['SAVEDREPORTS'] as &$tmpSavedReport )
{
if ( $tmpSavedReport['SavedReportID'] == $content['savedreportid'] )
{
// Copy reference and break loop
$mySavedReport = $tmpSavedReport;
break;
}
}
// Found reference to saved report, no process
if ( $mySavedReport != null )
{
// Get Objectreference to report
$myReportObj = $myReport["ObjRef"];
// Set SavedReport Settings!
$myReportObj->InitFromSavedReport($mySavedReport);
// Perform check
$res = $myReportObj->verifyDataSource();
if ( $res != SUCCESS )
{
$content['error_occured'] = true;
$content['error_details'] = GetAndReplaceLangStr( $content['LN_REPORTS_ERROR_ERRORCHECKINGSOURCE'], GetAndReplaceLangStr( GetErrorMessage($res), $mySavedReport['sourceid']) );
if ( isset($extraErrorDescription) )
$content['error_details'] .= "<br><br>" . GetAndReplaceLangStr( $content['LN_SOURCES_ERROR_EXTRAMSG'], $extraErrorDescription);
}
else
{
// Call processing part now!
}
}
else
{
$content['error_occured'] = true;
$content['error_details'] = $content['LN_GEN_ERROR_MISSINGSAVEDREPORTID'];
}
}
}
else
{
$content['error_occured'] = true;
$content['error_details'] = $content['LN_GEN_ERROR_MISSINGSAVEDREPORTID'];
}
if ( isset($content['Sources'][$currentSourceID]) )
{
// Obtain and get the Config Object
@ -466,31 +537,20 @@ if ( !$content['error_occured'] )
}
}
// Output error if occured
if ( $content['error_occured'] )
{
// Use JpGraph to display errors!
$myError = new JpGraphErrObjectImg();
$myError->SetTitle($content['LN_GEN_ERRORDETAILS']);
$myError->Raise($content['error_details'], true);
InitTemplateParser();
$page -> parser($content, "reportgenerator.html");
$page -> output();
exit;
}
else
{
/* // QUICK AND DIRTY!
$myImage = imagecreatetruecolor( $content['chart_width'], $content['chart_width']);
$text_color = imagecolorallocate($myImage, 255, 0, 0);
imagestring($myImage, 3, 10, 10, $content['LN_GEN_ERRORDETAILS'], $text_color);
imagestring($myImage, 3, 10, 25, $content['error_details'], $text_color);
header ("Content-type: image/png");
imagepng($myImage); // Outputs the image to the browser
imagedestroy($myImage); // Clean Image resource
*/
}
// ---
// --- Output the image
//$graph->Stroke();
$graph->StrokeCSIM( basename(__FILE__), '', 0);
// ---
?>

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

@ -64,7 +64,7 @@
<a href="{BASEPATH}admin/reports.php?op=editsavedreport&id={ID}&savedreportid={SavedReportID}">{customTitle}</a>
</td>
<td align="center" class="{srcssclass}">
&nbsp;<a href="{BASEPATH}reportgenerator.php?op=runreport&savedreportid={SavedReportID}" target="_blank"><img src="{MENU_CHART_PREVIEW}" width="16" title="{LN_REPORTS_RUNNOW}"></a>
&nbsp;<a href="{BASEPATH}reportgenerator.php?op=runreport&id={ID}&savedreportid={SavedReportID}" target="_blank"><img src="{MENU_CHART_PREVIEW}" width="16" title="{LN_REPORTS_RUNNOW}"></a>
&nbsp;<a href="{BASEPATH}admin/reports.php?op=editsavedreport&id={ID}&savedreportid={SavedReportID}"><img src="{MENU_EDIT}" width="16" title="{LN_REPORTS_EDITSAVEDREPORT}"></a>
&nbsp;<a href="{BASEPATH}admin/reports.php?op=removesavedreport&savedreportid={SavedReportID}"><img src="{MENU_DELETE}" width="16" title="{LN_REPORTS_REMOVESAVEDREPORT}"></a>