From a4b5f8607fd05a0b51792d8f2026cd34c26ef450 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Tue, 21 Jul 2015 13:10:44 +0200
Subject: [PATCH] Added feature. The report items SLA, Availaibily and General
 do not show the not init modules. TICKET: #2510

---
 pandora_console/include/functions_reporting.php | 17 ++++++++++++++---
 .../operation/agentes/status_monitor.php        |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 18df82fac3..f241e45a6e 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -626,7 +626,8 @@ function reporting_SLA($report, $content, $type = 'dinamic',
 					}
 				}
 				
-				if (modules_is_disable_agent($sla['id_agent_module'])) {
+				if (modules_is_disable_agent($sla['id_agent_module'])
+					|| modules_is_not_init($item['id_agent_module'])) {
 					if ($metaconsole_on) {
 						//Restore db connection
 						metaconsole_restore_db();
@@ -3673,7 +3674,10 @@ function reporting_availability($report, $content) {
 			}
 		}
 		
-		if (modules_is_disable_agent($item['id_agent_module'])) {
+		
+		
+		if (modules_is_disable_agent($item['id_agent_module'])
+			|| modules_is_not_init($item['id_agent_module'])) {
 			//Restore dbconnection
 			if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) {
 				metaconsole_restore_db();
@@ -3905,7 +3909,14 @@ function reporting_general($report, $content) {
 			}
 		}
 		
-		if (modules_is_disable_agent($row['id_agent_module'])) {
+		if (modules_is_disable_agent($row['id_agent_module']) ||
+			modules_is_not_init($item['id_agent_module'])) {
+			
+			if (is_metaconsole()) {
+				//Restore db connection
+				metaconsole_restore_db();
+			}
+			
 			continue;
 		}
 		
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 5d8f04a099..d790bedc07 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -132,7 +132,7 @@ if (!defined('METACONSOLE')) {
 	}
 }
 else {
-
+	
 	if ($ag_group != "0" && check_acl ($config["id_user"], $id_ag_group, "AR")) {
 		$sql_conditions_group = sprintf (" AND tagente.id_grupo IN (%s) ", $ag_group);
 	}