From e28415250cb5d57970868eddfc8a4297b2a97151 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Wed, 26 Feb 2020 15:18:42 +0100
Subject: [PATCH] remove entities from reports

---
 pandora_console/include/functions.php            |  2 --
 pandora_console/include/functions_reporting.php  | 16 ++++++++--------
 .../include/functions_reporting_xml.php          |  8 --------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 85274c4f91..693e72d744 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3081,8 +3081,6 @@ function array2XML($data, $root=null, $xml=null)
             $node = $xml->addChild($key);
             array2XML($value, $root, $node);
         } else {
-            $value = htmlentities($value);
-
             if (!is_numeric($value) && !is_bool($value)) {
                 if (!empty($value)) {
                     $xml->addChild($key, $value);
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index ad8bc7765a..ec01cf13bf 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -2298,7 +2298,7 @@ function reporting_agent_module($report, $content)
         $content['name'] = __('Agent/Modules');
     }
 
-    $return['title'] = $content['name'];
+    $return['title'] = io_safe_output($content['name']);
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $group_name = groups_get_name($content['id_group'], true);
@@ -2314,7 +2314,7 @@ function reporting_agent_module($report, $content)
     }
 
     $return['subtitle'] = $group_name.' - '.$module_group_name;
-    $return['description'] = $content['description'];
+    $return['description'] = io_safe_output($content['description']);
     $return['date'] = reporting_get_date_text($report, $content);
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
 
@@ -2871,11 +2871,11 @@ function reporting_group_report($report, $content)
     }
 
     $return['server_name'] = $server[0];
-    $return['title'] = $content['name'];
+    $return['title'] = io_safe_output($content['name']);
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = groups_get_name($content['id_group'], true);
-    $return['description'] = $content['description'];
+    $return['description'] = io_safe_output($content['description']);
     $return['date'] = reporting_get_date_text($report, $content);
 
     $return['data'] = [];
@@ -2975,7 +2975,7 @@ function reporting_event_report_agent(
     }
 
     $return['label'] = $label;
-    $return['title'] = $content['name'];
+    $return['title'] = io_safe_output($content['name']);
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = io_safe_output($agent_alias);
@@ -7358,7 +7358,7 @@ function reporting_general($report, $content)
             continue;
         }
 
-        $mod_name = modules_get_agentmodule_name($row['id_agent_module']);
+        $mod_name = io_safe_output(modules_get_agentmodule_name($row['id_agent_module']));
         $ag_name = modules_get_agentmodule_agent_alias($row['id_agent_module']);
         $name_agent = modules_get_agentmodule_agent_name($row['id_agent_module']);
         $type_mod = modules_get_last_value($row['id_agent_module']);
@@ -7872,14 +7872,14 @@ function reporting_simple_graph(
         );
     }
 
-    $return['title'] = $content['name'];
+    $return['title'] = io_safe_output($content['name']);
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $agent_alias.' - '.$module_name;
     $return['agent_name_db'] = agents_get_name($id_agent);
     $return['agent_name'] = $agent_alias;
     $return['module_name'] = $module_name;
-    $return['description'] = $content['description'];
+    $return['description'] = io_safe_output($content['description']);
     $return['date'] = reporting_get_date_text(
         $report,
         $content
diff --git a/pandora_console/include/functions_reporting_xml.php b/pandora_console/include/functions_reporting_xml.php
index 938961da75..1a50db787d 100644
--- a/pandora_console/include/functions_reporting_xml.php
+++ b/pandora_console/include/functions_reporting_xml.php
@@ -31,14 +31,6 @@ function reporting_xml_get_report($report, $filename, $return=false)
     unset($report['private']);
     unset($report['custom_logo']);
     // ----------------------------------------------------------------------
-    // change agent name.
-    if (count($report['contents']) > 0) {
-        for ($i = 0; $i < count($report['contents']); $i++) {
-            $aux = explode('-', $report['contents'][$i]['subtitle']);
-            $report['contents'][$i]['subtitle'] = db_get_value('alias', 'tagente', 'nombre', $report['contents'][$i]['agent_name']).' -'.$aux[1];
-        }
-    }
-
     // Remove entities.
     $report = io_safe_output($report);