From d2bc06276619cfed3eb404e416841650604a38e0 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 5 Jan 2018 10:29:46 +0100 Subject: [PATCH] fixed errors extensions agent-modules and recursion groups --- pandora_console/extensions/agents_modules.php | 441 +++++++++--------- pandora_console/godmode/groups/group_list.php | 2 +- .../massive/massive_delete_modules.php | 50 +- .../godmode/massive/massive_edit_modules.php | 70 ++- .../operation/agentes/ver_agente.php | 3 +- 5 files changed, 275 insertions(+), 291 deletions(-) diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index 6e6cf9a92e..4da2ad8238 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -14,17 +14,16 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -include_once($config['homedir'] . "/include/functions_agents.php"); -include_once($config['homedir'] . "/include/functions_modules.php"); -include_once($config['homedir'] . '/include/functions_users.php'); $refr = get_parameter('refresh', 0); // By default 30 seconds - function mainAgentsModules() { global $config; // Load global vars require_once ("include/config.php"); require_once ("include/functions_reporting.php"); + include_once($config['homedir'] . "/include/functions_agents.php"); + include_once($config['homedir'] . "/include/functions_modules.php"); + include_once($config['homedir'] . '/include/functions_users.php'); check_login (); // ACL Check @@ -52,7 +51,6 @@ function mainAgentsModules() { } } - if ($config["realtimestats"] == 0) { $updated_info = __('Last update'). " : ". ui_print_timestamp (db_get_sql ("SELECT min(utimestamp) FROM tgroup_stat"), true); } @@ -103,7 +101,6 @@ function mainAgentsModules() { serialize_in_temp($agents_id, $config['id_user']."_agents", 1); } - if ($config["pure"] == 0) { if($modules_selected[0] && $agents_id[0]){ @@ -128,7 +125,6 @@ function mainAgentsModules() { . ""; } else { - $fullscreen['text'] = '' . html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode'))) @@ -247,7 +243,6 @@ function mainAgentsModules() { ui_require_css_file('countdown'); } - if($config['pure'] != 1){ echo '
'; @@ -321,8 +316,7 @@ function mainAgentsModules() { foreach ($result_sql as $key => $value) { $all_modules[$value['id_agente_modulo']] = io_safe_output($name); } - } - + } } } else{ @@ -353,7 +347,6 @@ function mainAgentsModules() { $name = ''; $cont = 0; - foreach ($all_modules as $key => $module) { if ($module == $name) { $modules_by_name[$cont-1]['id'][] = $key; @@ -454,7 +447,7 @@ function mainAgentsModules() { "selection_a_m=" . $selection_a_m . "&" . "hor_offset=" . $new_hor_offset . "&". "offset=" . $offset . - "'>" . + "'>" . html_print_image( "images/arrow.png", true, array('title' => __('More modules'))) . @@ -585,7 +578,13 @@ function mainAgentsModules() { echo "
" . __("Cell turns blue when the module is in 'not initialize' status") . ""; echo ""; echo ""; - + $pure_var = $config['pure']; + if($pure_var){ + $pure_var = 1; + } + else{ + $pure_var = 0; + } echo " + - "; + "; } extensions_add_operation_menu_option(__("Agents/Modules view"), 'estado', 'agents_modules/icon_menu.png', "v1r1","view"); @@ -629,213 +831,4 @@ extensions_add_main_function('mainAgentsModules'); $ignored_params['refresh']=''; -?> - \ No newline at end of file +?> \ No newline at end of file diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index e62a8f4a86..d02571078e 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -130,7 +130,7 @@ if (is_ajax ()) { } else { $agents = agents_get_group_agents($id_group, $filter, "none", - false, $recursion, false, '|', $add_alert_bulk_op); + true, $recursion, false, '|', $add_alert_bulk_op); } $agents_disabled = array(); diff --git a/pandora_console/godmode/massive/massive_delete_modules.php b/pandora_console/godmode/massive/massive_delete_modules.php index b1cd1b220c..580c86c26c 100755 --- a/pandora_console/godmode/massive/massive_delete_modules.php +++ b/pandora_console/godmode/massive/massive_delete_modules.php @@ -698,8 +698,6 @@ $(document).ready (function () { $("#checkbox-recursion").click(function () { recursion = this.checked ? 1 : 0; - - $("#groups_select").trigger("change"); }); $("#groups_select").change ( @@ -790,33 +788,33 @@ $(document).ready (function () { }); $('#agents').change(function(e){ - for(var i=0;idata['form_agents_1'][1] = html_print_select_groups (false, 'AW', true, html_print_checkbox ("recursion", 1, false, true, false); $table->data['form_agents_1'][3] = __('Select all modules of this group') . ' ' . html_print_checkbox_extended ("force_group", 'group', '', '', false, - '', 'style="margin-right: 40px;"', true); - + '', 'style="margin-right: 40px;"'); $table->rowclass['form_modules_3'] = ''; $table->data['form_modules_3'][0] = __('Module Status'); @@ -695,7 +694,6 @@ $(document).ready (function () { clean_lists(); - $(".select_modules_row").css('display', ''); $(".select_agents_row").css('display', ''); $(".select_modules_row_2").css('display', 'none'); @@ -948,7 +946,7 @@ $(document).ready (function () { } } else if (this.id == "checkbox-recursion") { - $("#checkbox-force_group").attr("checked", false); + $("#checkbox-force_group").prop("checked", false); $("#groups_select").trigger("change"); } else if (this.id == "checkbox-warning_inverse") { @@ -962,7 +960,7 @@ $(document).ready (function () { } else { if (this.id == "checkbox-force_group") { - $("#checkbox-recursion").attr("checked", false); + $("#checkbox-recursion").prop("checked", false); } if (this.checked) { @@ -1058,8 +1056,6 @@ $(document).ready (function () { $("#checkbox-recursion").click(function () { recursion = this.checked ? 1 : 0; - - $("#groups_select").trigger("change"); }); $("#groups_select").change ( @@ -1102,11 +1098,11 @@ $(document).ready (function () { "get_agents_group_json" : 1, "recursion" : recursion, "id_group" : this.value, - status_agents: function () { - return $("#status_agents").val(); - }, - // Add a key prefix to avoid auto sorting in js object conversion - "keys_prefix" : "_" + status_agents: function () { + return $("#status_agents").val(); + }, + // Add a key prefix to avoid auto sorting in js object conversion + "keys_prefix" : "_" }, function (data, status) { $("#id_agents").html(''); @@ -1130,7 +1126,6 @@ $(document).ready (function () { $("#groups_select").trigger("change"); }); - if(""){ if("" == 'agents'){ $("#groups_select").trigger("change"); @@ -1138,7 +1133,6 @@ $(document).ready (function () { } $("#status_module").change(function() { - selector = $("#form_edit input[name=selection_mode]:checked").val(); if(selector == 'agents') { $("#id_agents").trigger("change"); @@ -1158,33 +1152,33 @@ $(document).ready (function () { }); $('#agents').change(function(e){ - for(var i=0;i 0) { $groups = array($id_group); - if ($recursion === 'true') { + if ($recursion === 'true' || $recursion == 1 ) { $groups = array_merge($groups, groups_get_id_recursive($id_group, true)); }