From 304a3b40c25be24be39b5e1b54cd0d58384e7ac3 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Thu, 16 Aug 2018 12:48:44 +0200 Subject: [PATCH] Fixed overwrite primery group if user has no permissions for this group on update agent --- pandora_console/godmode/agentes/agent_manager.php | 1 + pandora_console/godmode/agentes/configurar_agente.php | 7 +++---- pandora_console/include/class/Tree.class.php | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 5879790d57..990de5042c 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -279,6 +279,7 @@ if (isset($groups[$grupo]) || $new_agent) { $table->data[4][1] = html_print_select_groups(false, "AR", false, 'grupo', $grupo, '', '', 0, true); } else { $table->data[4][1] = groups_get_name($grupo); + $table->data[4][1] .= html_print_input_hidden('grupo', $grupo, true); } $table->data[4][1] .= ' '; $table->data[4][1] .= ui_print_group_icon ($grupo, true); diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index ed52464dc0..d858fc0578 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -800,10 +800,9 @@ if ($update_agent) { // if modified some agent paramenter ui_print_error_message(__('No agent alias specified')); //If there is an agent with the same name, but a different ID } - /*elseif (agents_get_agent_id ($nombre_agente) > 0 && - agents_get_agent_id ($nombre_agente) != $id_agente) { - ui_print_error_message(__('There is already an agent in the database with this name')); - }*/ + if ($grupo <= 0) { + ui_print_error_message(__('The group id %d is incorrect.', $grupo)); + } else { //If different IP is specified than previous, add the IP if ($direccion_agente != '' && diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php index 58eba91e70..497b12aa0d 100644 --- a/pandora_console/include/class/Tree.class.php +++ b/pandora_console/include/class/Tree.class.php @@ -1046,7 +1046,6 @@ class Tree { // Modules SQL if ($item_for_count === false) { - html_debug("traza", true); //FIXME This group ACL should be the same in all modules view $group_acl = " AND (ta.id_grupo IN ($user_groups_str) OR tasg.id_group IN ($user_groups_str))"; $sql = "SELECT $columns