From 315744f66847cd78bc739ac332bbbc1a533803a8 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Thu, 25 Jun 2015 13:48:12 +0200
Subject: [PATCH] Some changes for to get the data of template from array.

---
 .../include/functions_reporting.php           | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index ec6584ba1f..31681ef300 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -131,7 +131,7 @@ function reporting_make_reporting_data($report = null, $id_report,
 	$report["group_name"] = groups_get_name ($report['id_group']);
 	$report['contents'] = array();
 	
-	if ($contents === false) {
+	if (empty($contents)) {
 		return reporting_check_structure_report($report);
 	}
 	
@@ -484,9 +484,14 @@ function reporting_SLA($report, $content, $type = 'dinamic',
 	
 	$edge_interval = 10;
 	
-	$slas = db_get_all_rows_field_filter (
-		'treport_content_sla_combined',
-		'id_report_content', $content['id_rc']);
+	if (empty($content['subitems'])) {
+		$slas = db_get_all_rows_field_filter (
+			'treport_content_sla_combined',
+			'id_report_content', $content['id_rc']);
+	}
+	else {
+		$slas = $content['subitems'];
+	}
 	
 	if (empty($slas)) {
 		$return['failed'] = __('There are no SLAs defined');
@@ -3971,9 +3976,16 @@ function reporting_general($report, $content) {
 	$return["max"]["agent"] = null;
 	$return["max"]["module"] = null;
 	
-	$generals = db_get_all_rows_filter(
-		'treport_content_item',
-		array('id_report_content' => $content['id_rc']));
+	if (empty($content['subitems'])) {
+		$generals = db_get_all_rows_filter(
+			'treport_content_item',
+			array('id_report_content' => $content['id_rc']));
+	}
+	else {
+		$generals = $content['subitems'];
+	}
+	
+	
 	if (empty($generals)) {
 		$generals = array();
 	}