tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Working in the dynamic reports, these are the last changes in the refactored code. Now I am going to check in metaconsole.

Browse Source
This commit is contained in:
mdtrooper 2015-06-25 16:01:10 +02:00
parent 315744f668
commit 77e1acc613
1 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
pandora_console/include/functions_reporting.php
View File

@ -941,12 +941,19 @@ function reporting_event_top_n($report, $content, $type = 'dinamic',
$top_n_value = $content['top_n_value']; $top_n_value = $content['top_n_value'];
$show_graph = $content['show_graph']; $show_graph = $content['show_graph'];
//Get all the related data
$sql = sprintf("SELECT id_agent_module, server_name
FROM treport_content_item
WHERE id_report_content = %d", $content['id_rc']);
$tops = db_process_sql ($sql);
if (empty($content['subitems'])) {
//Get all the related data
$sql = sprintf("SELECT id_agent_module, server_name
FROM treport_content_item
WHERE id_report_content = %d", $content['id_rc']);
$tops = db_process_sql ($sql);
}
else {
$tops = $content['subitems'];
}
// Get chart // Get chart
reporting_set_conf_charts($width, $height, $only_image, $type, reporting_set_conf_charts($width, $height, $only_image, $type,
@ -1739,13 +1746,22 @@ function reporting_exception($report, $content, $type = 'dinamic',
//Get all the related data
$sql = sprintf("
SELECT id_agent_module, server_name, operation
FROM treport_content_item
WHERE id_report_content = %d", $content['id_rc']);
$exceptions = db_process_sql ($sql);
if (empty($content['subitems'])) {
//Get all the related data
$sql = sprintf("
SELECT id_agent_module, server_name, operation
FROM treport_content_item
WHERE id_report_content = %d", $content['id_rc']);
$exceptions = db_process_sql ($sql);
}
else {
$exceptions = $content['subitems'];
}
if ($exceptions === false) { if ($exceptions === false) {
$return['failed'] = __('There are no Agent/Modules defined'); $return['failed'] = __('There are no Agent/Modules defined');
} }
@ -3741,14 +3757,21 @@ function reporting_availability($report, $content) {
} }
$sql = sprintf(" if (empty($content['subitems'])) {
SELECT id_agent_module, $sql = sprintf("
server_name, operation SELECT id_agent_module,
FROM treport_content_item server_name, operation
WHERE id_report_content = %d", FROM treport_content_item
$content['id_rc']); WHERE id_report_content = %d",
$content['id_rc']);
$items = db_process_sql ($sql);
}
else {
$items = $content['subitems'];
}
$items = db_process_sql ($sql);
$data = array(); $data = array();