From e4b74cffc8546720fa9eba0a7a6a698faab52cf7 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Tue, 24 Jul 2018 13:04:31 +0200 Subject: [PATCH] fixed bug in modules massive deletion to avoid deletion of modules with the same name in distinct agents regardless of their status when module status filter has been applied --- .../godmode/massive/massive_delete_modules.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/massive/massive_delete_modules.php b/pandora_console/godmode/massive/massive_delete_modules.php index d1dd485db2..4646dea1a8 100755 --- a/pandora_console/godmode/massive/massive_delete_modules.php +++ b/pandora_console/godmode/massive/massive_delete_modules.php @@ -52,6 +52,8 @@ function process_manage_delete ($module_name, $id_agents, $module_status = 'all' global $config; + $status_module = (int) get_parameter ('status_module'); + if (empty ($module_name)) { ui_print_error_message(__('No module selected')); return false; @@ -212,8 +214,10 @@ function process_manage_delete ($module_name, $id_agents, $module_status = 'all' } } else { - $modules = agents_get_modules ($id_agents, 'id_agente_modulo', - sprintf('nombre IN ("%s")', implode('","',$module_name)), true); + if ($status_module != -1) // If module status filter has been applied + $modules = agents_get_modules ($id_agents, 'id_agente_modulo', sprintf('nombre IN ("%s") AND id_agente_modulo IN (SELECT id_agente_modulo FROM tagente_estado where estado = %s OR utimestamp=0 )', implode('","',$module_name), $status_module), true); + else + $modules = agents_get_modules ($id_agents, 'id_agente_modulo', sprintf('nombre IN ("%s")', implode('","',$module_name)), true); } }