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

Ent 5604 policy modules japanese bug

This commit is contained in:
Luis 2020-04-02 14:30:02 +02:00 committed by Daniel Rodriguez
parent e30b9a32d8
commit bcd9aabcd8
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -830,14 +830,7 @@ foreach ($modules as $module) {
$data[4] .= ui_print_help_tip(__('The policy modules of data type will only update their intervals when policy is applied.'), true); $data[4] .= ui_print_help_tip(__('The policy modules of data type will only update their intervals when policy is applied.'), true);
} }
$data[5] = ui_print_truncate_text($module['descripcion'], 'description', false);
if ($module['id_modulo'] == MODULE_DATA && $module['id_policy_module'] != 0) {
$module_description = utf8_decode($module['descripcion']);
} else {
$module_description = $module['descripcion'];
}
$data[5] = ui_print_truncate_text($module_description, 'description', false);
$data[6] = ui_print_status_image($status, htmlspecialchars($title), true); $data[6] = ui_print_status_image($status, htmlspecialchars($title), true);

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

@ -1004,14 +1004,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[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> ';
} }
$module_description = '';
if ($module['id_modulo'] == MODULE_DATA && $module['id_policy_module'] != 0) {
$module_description = utf8_decode($module['descripcion']);
} else {
$module_description = $module['descripcion'];
}
$data[4] = ui_print_string_substr($module_description, 60, true, 8); $data[4] = ui_print_string_substr($module['descripcion'], 60, true, 8);
if ($module['datos'] != strip_tags($module['datos'])) { if ($module['datos'] != strip_tags($module['datos'])) {

16
pandora_console/include/functions_treeview.php
View File

@ -124,16 +124,16 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals
$table->data['module_group'] = $row; $table->data['module_group'] = $row;
// Description // Description
$module_description = '';
if ($module['id_modulo'] == MODULE_DATA && $module['id_policy_module'] != 0) {
$module_description = utf8_decode($module['descripcion']);
} else {
$module_description = $module['descripcion'];
}
$row = []; $row = [];
$row['title'] = __('Description'); $row['title'] = __('Description');
$row['data'] = ui_print_truncate_text($module_description, 'description', true, true, true, '[&hellip;]'); $row['data'] = ui_print_truncate_text(
$module['descripcion'];,
'description',
true,
true,
true,
'[&hellip;]'
);
$table->data['description'] = $row; $table->data['description'] = $row;
// Tags // Tags