tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5673-Mala-visualizacion-de-modulos-con-caracteres-japones' into 'develop' 

Fixed errors encoding

See merge request artica/pandorafms!3234
This commit is contained in:
Daniel Rodriguez 2020-06-02 17:24:11 +02:00
parent ab0a914248 db32fedde4
commit 86afda25fe
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/godmode/agentes/module_manager.php
View File

@ -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'],

2
pandora_console/include/ajax/module.php
View File

@ -1013,10 +1013,8 @@ if (check_login()) {
$data[3] .= ' <a class="relations_details" href="ajax.php?page=operation/agentes/estado_monitores&get_relations_tooltip=1&id_agente_modulo='.$module['id_agente_modulo'].'">'.html_print_image('images/link2.png', true, ['id' => 'relations-details-'.$module['id_agente_modulo'], 'class' => 'img_help']).'</a> ';
}
$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 {

9
pandora_console/include/functions_treeview.php
View File

@ -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 = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" . remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
// ~ $data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" . remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
// ~ else
// ~ $data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" . substr(io_safe_output($last_data['datos']),0,12) . "</span>";
// ~ $data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" . substr(io_safe_output($last_data['datos']),0,12) . "</span>";
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 = "<span title='".$last_data['datos']."' style='white-space: nowrap;'>".human_milliseconds_to_string($last_data['datos']).'</span>';
} else if (is_numeric($last_data['datos'])) {
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>".remove_right_zeros(number_format($last_data['datos'], $config['graph_precision'])).'</span>';
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>".remove_right_zeros(number_format($last_data['datos'], $config['graph_precision'])).'</span>';
} 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 = "<span title='".human_milliseconds_to_string($last_data['datos'])."' style='white-space: nowrap;'>".human_milliseconds_to_string($last_data['datos']).'</span>';
} else if (is_numeric($last_data['datos'])) {
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>".remove_right_zeros(number_format($last_data['datos'], $config['graph_precision'])).'</span>';
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>".remove_right_zeros(number_format($last_data['datos'], $config['graph_precision'])).'</span>';
} else {
$data = ui_print_truncate_text(
io_safe_output($last_data['datos']),