From db32fedde4c5d2e2f6fe6afa9b6b449524e22cbb Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Mon, 25 May 2020 17:06:20 +0200 Subject: [PATCH] Fixed errors encoding --- pandora_console/godmode/agentes/module_manager.php | 6 +++++- pandora_console/include/ajax/module.php | 2 -- pandora_console/include/functions_treeview.php | 9 ++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index fcb8a1df52..2ae1761f49 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -703,6 +703,10 @@ foreach ($modules as $module) { $module_interval2 = $module['module_interval']; $module_group2 = $module['id_module_group']; + if ($module['id_modulo'] == MODULE_DATA && $module['id_policy_module'] != 0) { + $nombre_modulo = utf8_decode($module['nombre']); + } + $data = []; if (!$checked) { @@ -834,7 +838,7 @@ foreach ($modules as $module) { $data[6] = ui_print_status_image($status, htmlspecialchars($title), true); - // MAX / MIN values + // MAX / MIN values. if ($module['id_tipo_modulo'] != 25) { $data[7] = ui_print_module_warn_value( $module['max_warning'], diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index f652c173c1..4691ebfaa9 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -1004,10 +1004,8 @@ if (check_login()) { $data[3] .= ' '.html_print_image('images/link2.png', true, ['id' => 'relations-details-'.$module['id_agente_modulo'], 'class' => 'img_help']).' '; } - $data[4] = ui_print_string_substr($module['descripcion'], 60, true, 8); - if ($module['datos'] != strip_tags($module['datos'])) { $module_value = io_safe_input($module['datos']); } else { diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index 32688a25ea..adf80c188e 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -123,7 +123,6 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals $row['data'] = $module_group; $table->data['module_group'] = $row; - // Description. $row = []; $row['title'] = __('Description'); $row['data'] = ui_print_truncate_text( @@ -189,16 +188,16 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals default: // ~ if (is_numeric($last_data["datos"])) - // ~ $data = "" . remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . ""; + // ~ $data = "" . remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . ""; // ~ else - // ~ $data = "" . substr(io_safe_output($last_data['datos']),0,12) . ""; + // ~ $data = "" . substr(io_safe_output($last_data['datos']),0,12) . ""; switch ($module['id_tipo_modulo']) { case 15: $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module['id_agente_modulo']); if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') { $data = "".human_milliseconds_to_string($last_data['datos']).''; } else if (is_numeric($last_data['datos'])) { - $data = "".remove_right_zeros(number_format($last_data['datos'], $config['graph_precision'])).''; + $data = "".remove_right_zeros(number_format($last_data['datos'], $config['graph_precision'])).''; } else { $data = ui_print_truncate_text( io_safe_output($last_data['datos']), @@ -237,7 +236,7 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') { $data = "".human_milliseconds_to_string($last_data['datos']).''; } else if (is_numeric($last_data['datos'])) { - $data = "".remove_right_zeros(number_format($last_data['datos'], $config['graph_precision'])).''; + $data = "".remove_right_zeros(number_format($last_data['datos'], $config['graph_precision'])).''; } else { $data = ui_print_truncate_text( io_safe_output($last_data['datos']),