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

Merge branch 'fix-html-entities-in-networkmap-relations' into 'develop' 

[Console > Network map] Fix the output of content with html entities

See merge request artica/pandorafms!1120
This commit is contained in:
vgilc 2018-01-02 10:02:28 +01:00
parent b3f23b53c2 9796b4b4a0
commit d34aad4a30
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_pandora_networkmap.php
View File

@ -697,7 +697,8 @@ function networkmap_links_to_js_links($relations, $nodes_graph) {
$text_end = modules_get_agentmodule_name((int)$id_target_module);
if (preg_match ("/(.+)_ifOperStatus$/" , (string)$text_end, $matches)) {
if ($matches[1]) {
$item['text_end'] = $matches[1];
// It's ok to safe_output as it inlo goint to be user into the map line
$item['text_end'] = io_safe_output($matches[1]);
}
}
}
@ -708,7 +709,8 @@ function networkmap_links_to_js_links($relations, $nodes_graph) {
$text_start = modules_get_agentmodule_name((int)$id_source_module);
if (preg_match ("/(.+)_ifOperStatus$/" , (string)$text_start, $matches)) {
if ($matches[1]) {
$item['text_start'] = $matches[1];
// It's ok to safe_output as it inlo goint to be user into the map line
$item['text_start'] = io_safe_output($matches[1]);
}
}
}