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

Revert "Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'" 

This reverts merge request !2519
This commit is contained in:
vgilc 2020-02-26 14:27:19 +01:00
parent 3b9e100f9f
commit a0ea52983b
3 changed files with 2173 additions and 1649 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions.php
View File

@ -3081,6 +3081,8 @@ function array2XML($data, $root=null, $xml=null)
$node = $xml->addChild($key); $node = $xml->addChild($key);
array2XML($value, $root, $node); array2XML($value, $root, $node);
} else { } else {
$value = htmlentities($value);
if (!is_numeric($value) && !is_bool($value)) { if (!is_numeric($value) && !is_bool($value)) {
if (!empty($value)) { if (!empty($value)) {
$xml->addChild($key, $value); $xml->addChild($key, $value);

3812
pandora_console/include/functions_reporting.php
View File

File diff suppressed because it is too large Load Diff

8
pandora_console/include/functions_reporting_xml.php
View File

@ -31,6 +31,14 @@ function reporting_xml_get_report($report, $filename, $return=false)
unset($report['private']); unset($report['private']);
unset($report['custom_logo']); 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. // Remove entities.
$report = io_safe_output($report); $report = io_safe_output($report);