From 00f0a171b417544197487662fa83d7c0552609f5 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 15 Mar 2017 18:45:52 +0100
Subject: [PATCH] Show agent - module in pdf reports item - #528

---
 .../include/functions_reporting.php           | 69 +++++++++++++------
 1 file changed, 48 insertions(+), 21 deletions(-)

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 22cf352e69..93f25ad93f 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -2341,7 +2341,13 @@ function reporting_historical_data($report, $content) {
 		$content['name'] = __('Historical data');
 	}
 	
+	$module_name = io_safe_output(
+		modules_get_agentmodule_name($content['id_agent_module']));
+	$agent_name = io_safe_output(
+		modules_get_agentmodule_agent_alias ($content['id_agent_module']));	
+	
 	$return['title'] = $content['name'];
+	$return['subtitle'] = $agent_name . " - " . $module_name;
 	$return["description"] = $content["description"];
 	$return["date"] = reporting_get_date_text($report, $content);
 	$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
@@ -2398,7 +2404,14 @@ function reporting_database_serialized($report, $content) {
 		$content['name'] = __('Database Serialized');
 	}
 	
+	
+	$module_name = io_safe_output(
+		modules_get_agentmodule_name($content['id_agent_module']));
+	$agent_name = io_safe_output(
+		modules_get_agentmodule_agent_alias ($content['id_agent_module']));	
+	
 	$return['title'] = $content['name'];
+	$return['subtitle'] = $agent_name . " - " . $module_name;
 	$return["description"] = $content["description"];
 	$return["date"] = reporting_get_date_text($report, $content);
 	$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
@@ -3123,13 +3136,13 @@ function reporting_sql_graph($report, $content, $type,
 	if (empty($content['name'])) {
 		switch ($type_sql_graph) {
 			case 'sql_graph_vbar':
-				$return['name'] = __('SQL Graph Vertical Bars');
+				$content['name'] = __('SQL Graph Vertical Bars');
 				break;
 			case 'sql_graph_hbar':
-				$return['name'] = __('SQL Graph Horizontal Bars');
+				$content['name'] = __('SQL Graph Horizontal Bars');
 				break;
 			case 'sql_graph_pie':
-				$return['name'] = __('SQL Graph Pie');
+				$content['name'] = __('SQL Graph Pie');
 				break;
 		}
 	}
@@ -3179,7 +3192,13 @@ function reporting_monitor_report($report, $content) {
 		$content['name'] = __('Monitor Report');
 	}
 	
+	$module_name = io_safe_output(
+		modules_get_agentmodule_name($content['id_agent_module']));
+	$agent_name = io_safe_output(
+		modules_get_agentmodule_agent_alias ($content['id_agent_module']));	
+	
 	$return['title'] = $content['name'];
+	$return['subtitle'] = $agent_name . " - " . $module_name;
 	$return["description"] = $content["description"];
 	$return["date"] = reporting_get_date_text($report, $content);
 	$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
@@ -3247,19 +3266,19 @@ function reporting_netflow($report, $content, $type,
 	if (empty($content['name'])) {
 		switch ($type_netflow) {
 			case 'netflow_area':
-				$return['name'] = __('Netflow Area');
+				$content['name'] = __('Netflow Area');
 				break;
 			case 'netflow_pie':
-				$return['name'] = __('Netflow Pie');
+				$content['name'] = __('Netflow Pie');
 				break;
 			case 'netflow_data':
-				$return['name'] = __('Netflow Data');
+				$content['name'] = __('Netflow Data');
 				break;
 			case 'netflow_statistics':
-				$return['name'] = __('Netflow Statistics');
+				$content['name'] = __('Netflow Statistics');
 				break;
 			case 'netflow_summary':
-				$return['name'] = __('Netflow Summary');
+				$content['name'] = __('Netflow Summary');
 				break;
 		}
 	}
@@ -3325,7 +3344,13 @@ function reporting_simple_baseline_graph($report, $content,
 		$content['name'] = __('Simple baseline graph');
 	}
 	
+	$module_name = io_safe_output(
+		modules_get_agentmodule_name($content['id_agent_module']));
+	$agent_name = io_safe_output(
+		modules_get_agentmodule_agent_alias ($content['id_agent_module']));
+	
 	$return['title'] = $content['name'];
+	$return['subtitle'] = $agent_name . " - " . $module_name;
 	$return["description"] = $content["description"];
 	$return["date"] = reporting_get_date_text($report, $content);
 	$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
@@ -3386,16 +3411,17 @@ function reporting_prediction_date($report, $content) {
 		$content['name'] = __('Prediction Date');
 	}
 	
-	$return['title'] = $content['name'];
-	$return["description"] = $content["description"];
-	$return["date"] = reporting_get_date_text($report, $content);
-	$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
-	
 	$module_name = io_safe_output(
 		modules_get_agentmodule_name($content['id_agent_module']));
 	$agent_name = io_safe_output(
-		modules_get_agentmodule_agent_name ($content['id_agent_module']));
+		modules_get_agentmodule_agent_alias ($content['id_agent_module']));
 	
+	$return['title'] = $content['name'];
+	$return['subtitle'] = $agent_name . " - " . $module_name;
+	$return["description"] = $content["description"];
+	$return["date"] = reporting_get_date_text($report, $content);
+	$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+		
 	$return['agent_name'] = $agent_name;
 	$return['module_name'] = $module_name;
 	
@@ -3436,16 +3462,17 @@ function reporting_projection_graph($report, $content,
 		$content['name'] = __('Projection Graph');
 	}
 	
-	$return['title'] = $content['name'];
-	$return["description"] = $content["description"];
-	$return["date"] = reporting_get_date_text($report, $content);
-	$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
-		
 	$module_name = io_safe_output(
 		modules_get_agentmodule_name($content['id_agent_module']));
 	$agent_name = io_safe_output(
-		modules_get_agentmodule_agent_name ($content['id_agent_module']));
+		modules_get_agentmodule_agent_alias ($content['id_agent_module']));
 	
+	$return['title'] = $content['name'];
+	$return['subtitle'] = $agent_name . " - " . $module_name;
+	$return["description"] = $content["description"];
+	$return["date"] = reporting_get_date_text($report, $content);
+	$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+			
 	$return['agent_name'] = $agent_name;
 	$return['module_name'] = $module_name;
 	
@@ -3688,7 +3715,7 @@ function reporting_value($report, $content, $type) {
 				$content['name'] = __('TTO');
 				break;
 			case 'TTRT':
-				$return['type'] = __('TTRT');
+				$content['name'] = __('TTRT');
 				break;
 		}
 	}