From b2257ac1b1d917af9d0b6d08ba3231beeaa8a879 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 3 Nov 2023 12:12:26 +0100
Subject: [PATCH] Fix csv agent-module pandora_enterprise#12363

---
 .../extensions/agents_modules_csv.php         | 20 ++++++++++++++++++-
 pandora_console/include/functions_modules.php |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/pandora_console/extensions/agents_modules_csv.php b/pandora_console/extensions/agents_modules_csv.php
index 6ed1061c11..086228b521 100644
--- a/pandora_console/extensions/agents_modules_csv.php
+++ b/pandora_console/extensions/agents_modules_csv.php
@@ -106,7 +106,25 @@ if ($get_agents_module_csv === '1') {
 
     foreach ($results as $result) {
         foreach ($result as $key => $value) {
-            $out_csv .= io_safe_output($value).$divider;
+            if (preg_match('/Linux/i', $_SERVER['HTTP_USER_AGENT'])) {
+                $value = preg_replace(
+                    '/\s+/',
+                    ' ',
+                    io_safe_output($value)
+                );
+            } else {
+                $value = mb_convert_encoding(
+                    preg_replace(
+                        '/\s+/',
+                        '',
+                        io_safe_output($value)
+                    ),
+                    'UTF-16LE',
+                    'UTF-8'
+                );
+            }
+
+            $out_csv .= $value.$divider;
         }
 
         $out_csv .= "\n";
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index de618605c8..090bb8bdb9 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -4735,7 +4735,7 @@ function export_agents_module_csv($filters)
                         $query_filter .= ' AND tam.nombre IN '.$module_filter.' ';
                     } else {
                         $module_filter = '('.implode(', ', $filter).')';
-                        $query_filter .= ' AND tam.id_tipo_modulo IN '.$module_filter.' ';
+                        $query_filter .= ' AND tam.id_agente_modulo IN '.$module_filter.' ';
                     }
                 }
             break;