From bcd9aabcd8bfc975571d9d47e44e3aa82c393178 Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Thu, 2 Apr 2020 14:30:02 +0200
Subject: [PATCH] Ent 5604 policy modules japanese bug

---
 .../godmode/agentes/module_manager.php           |  9 +--------
 pandora_console/include/ajax/module.php          |  8 +-------
 pandora_console/include/functions_treeview.php   | 16 ++++++++--------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 445323e186..fcb8a1df52 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -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);
     }
 
-
-    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[5] = ui_print_truncate_text($module['descripcion'], 'description', false);
 
     $data[6] = ui_print_status_image($status, htmlspecialchars($title), true);
 
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 10587df2dc..cecf14d4df 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -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> ';
             }
 
-            $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'])) {
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index 6925ceab20..3217a544bf 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -124,16 +124,16 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals
     $table->data['module_group'] = $row;
 
     // 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['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;
 
     // Tags