From 4ad0085602aec59ff08cc2fb798dce35cfd27bf4 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 12 Dec 2017 17:58:06 +0100
Subject: [PATCH] Update metaconsole after agent bulk operations for update -
 #1674

---
 pandora_console/godmode/massive/massive_edit_agents.php | 3 +--
 pandora_server/bin/pandora_server                       | 2 +-
 pandora_server/lib/PandoraFMS/Core.pm                   | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index 1b77093025..555883acda 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -135,8 +135,7 @@ if ($update_agents) {
 	$result = false;
 	foreach ($id_agents as $id_agent) {
 		if (!empty($values)) {
-			if ($config['metaconsole_agent_cache'] == 1 &&
-			    isset($values['id_grupo'])) {
+			if ($config['metaconsole_agent_cache'] == 1) {
 				$values['update_module_count'] = 1; // Force an update of the agent cache.
 			}
 			$group_old = false;
diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 1f13627cb3..03ff4ac0fe 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -293,7 +293,7 @@ sub pandora_server_tasks ($) {
 				if (($counter % 30) == 0) {
 	
 					# Update module status and fired alert counts
-					my @agents = get_db_rows ($dbh, 'SELECT id_agente, nombre, update_module_count, update_alert_count FROM tagente WHERE disabled = 0 AND (update_module_count=1 OR update_alert_count=1)');
+					my @agents = get_db_rows ($dbh, 'SELECT id_agente, nombre, update_module_count, update_alert_count FROM tagente WHERE (update_module_count=1 OR update_alert_count=1)');
 					foreach my $agent (@agents) {
 						logger ($pa_config, "Updating module status and fired alert counts for agent " . $agent->{'nombre'}, 10);
 						
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 11278d61fe..56ba38dcbe 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -5146,7 +5146,7 @@ sub pandora_update_agent_module_count ($$$) {
 	}; # Module counts by status.
 
 	# Retrieve and hash module status counts.
-	my @rows = get_db_rows ($dbh, 'SELECT estado, COUNT(*) AS total FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=?GROUP BY estado', $agent_id);
+	my @rows = get_db_rows ($dbh, 'SELECT estado, COUNT(*) AS total FROM tagente_modulo, tagente_estado WHERE tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=?GROUP BY estado', $agent_id);
 	foreach my $row (@rows) {
 		$counts->{$row->{'estado'}} = $row->{'total'};
 		$total += $row->{'total'};