From 5979d51d68bdae29a205ab5f3cf6929c445ae6f9 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Wed, 13 Mar 2024 11:13:37 +0100 Subject: [PATCH 1/5] #13034 fixed view module --- pandora_console/godmode/agentes/module_manager.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index c3772c00d3..901a340913 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -807,6 +807,8 @@ if ($modules !== false) { '', true ); + } else { + $data['checkbox'] = ''; } $data[0] = ''; From c9e515e121dc4f6bc275eaa53da74f82a3f8f7b1 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 14 Mar 2024 16:45:02 +0100 Subject: [PATCH 2/5] #13034 fixed checkbox in head --- .../godmode/agentes/module_manager.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 901a340913..be1b620800 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -662,13 +662,18 @@ if ($modules !== false) { $table->width = '100%'; $table->class = 'tactical_table info_table'; $table->head = []; - $table->head['checkbox'] = html_print_checkbox( - 'all_delete', - 0, - false, - true, - false - ); + if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') === true) { + $table->head['checkbox'] = html_print_checkbox( + 'all_delete', + 0, + false, + true, + false + ); + } else { + $table->head['checkbox'] = ''; + } + $table->head[0] = ''.__('Name').''.ui_get_sorting_arrows( $url_name.'up', $url_name.'down', From d221094f61481fa39a14bcca82ce350156cace7e Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 14 Mar 2024 16:49:39 +0100 Subject: [PATCH 3/5] #13034 fixed checkbox --- .../godmode/agentes/module_manager.php | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index be1b620800..1b87278ce8 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -670,8 +670,6 @@ if ($modules !== false) { true, false ); - } else { - $table->head['checkbox'] = ''; } $table->head[0] = ''.__('Name').''.ui_get_sorting_arrows( @@ -812,8 +810,6 @@ if ($modules !== false) { '', true ); - } else { - $data['checkbox'] = ''; } $data[0] = ''; @@ -1269,23 +1265,11 @@ html_print_div( $('#modal').dialog("close"); }); - $('[id^=checkbox-id_delete]').change(function(){ - if($(this).parent().parent().hasClass('checkselected')){ - $(this).parent().parent().removeClass('checkselected'); - } - else{ - $(this).parent().parent().addClass('checkselected'); - } - }); - - $('[id^=checkbox-all_delete]').change(function(){ if ($("#checkbox-all_delete").prop("checked")) { - $('[id^=checkbox-id_delete]').parent().parent().addClass('checkselected'); $("[name^=id_delete").prop("checked", true); } else{ - $('[id^=checkbox-id_delete]').parent().parent().removeClass('checkselected'); $("[name^=id_delete").prop("checked", false); } }); From 58919847cb25bf1bf031c6bc0aa62a167ea1bbfd Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Fri, 15 Mar 2024 09:07:15 +0100 Subject: [PATCH 4/5] #13034 fixed acl --- .../include/class/AgentsAlerts.class.php | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/pandora_console/include/class/AgentsAlerts.class.php b/pandora_console/include/class/AgentsAlerts.class.php index 70c1ff9e3c..70a6a960f4 100644 --- a/pandora_console/include/class/AgentsAlerts.class.php +++ b/pandora_console/include/class/AgentsAlerts.class.php @@ -262,20 +262,24 @@ class AgentsAlerts extends HTML $data[0] = io_safe_output($agent_module['alias']); $data[1] = io_safe_output($agent_module['nombre']); $uniqid = $agent_module['id_agente_modulo']; - $data[2] = html_print_anchor( - [ - 'href' => sprintf( - 'javascript:show_add_alerts(\'%s\')', - $uniqid - ), - 'content' => html_print_image( - 'images/add_mc.png', - true, - ['class' => 'main_menu_icon invert_filter'] - ), - ], - true - ); + if (check_acl($this->idUser, 0, 'LM')) { + $data[2] = html_print_anchor( + [ + 'href' => sprintf( + 'javascript:show_add_alerts(\'%s\')', + $uniqid + ), + 'content' => html_print_image( + 'images/add_mc.png', + true, + ['class' => 'main_menu_icon invert_filter'] + ), + ], + true + ); + } else { + $data[2] = ''; + } array_push($table->data, $data); From eedf15d4e0e9b39953966c5d7b90bb7754868aa6 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Fri, 15 Mar 2024 09:10:27 +0100 Subject: [PATCH 5/5] revert change --- .../include/class/AgentsAlerts.class.php | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pandora_console/include/class/AgentsAlerts.class.php b/pandora_console/include/class/AgentsAlerts.class.php index 70a6a960f4..70c1ff9e3c 100644 --- a/pandora_console/include/class/AgentsAlerts.class.php +++ b/pandora_console/include/class/AgentsAlerts.class.php @@ -262,24 +262,20 @@ class AgentsAlerts extends HTML $data[0] = io_safe_output($agent_module['alias']); $data[1] = io_safe_output($agent_module['nombre']); $uniqid = $agent_module['id_agente_modulo']; - if (check_acl($this->idUser, 0, 'LM')) { - $data[2] = html_print_anchor( - [ - 'href' => sprintf( - 'javascript:show_add_alerts(\'%s\')', - $uniqid - ), - 'content' => html_print_image( - 'images/add_mc.png', - true, - ['class' => 'main_menu_icon invert_filter'] - ), - ], - true - ); - } else { - $data[2] = ''; - } + $data[2] = html_print_anchor( + [ + 'href' => sprintf( + 'javascript:show_add_alerts(\'%s\')', + $uniqid + ), + 'content' => html_print_image( + 'images/add_mc.png', + true, + ['class' => 'main_menu_icon invert_filter'] + ), + ], + true + ); array_push($table->data, $data);