From 6d120f8081771d7290703c9828bda525bef9b811 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Mon, 8 Jan 2018 14:46:36 +0100 Subject: [PATCH] Fixed link to Pandora FMS in networkmap --- .../include/functions_pandora_networkmap.php | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php index 8f40791cba..bf05d37bbb 100644 --- a/pandora_console/include/functions_pandora_networkmap.php +++ b/pandora_console/include/functions_pandora_networkmap.php @@ -909,17 +909,30 @@ function networkmap_write_js_array($id, $nodes_and_relations = array(), $map_das $links_js = networkmap_links_to_js_links($relations, $nodes_graph); + $array_aux = array(); foreach ($links_js as $link_js) { if ($link_js['deleted']) { - continue; + unset($links_js[$link_js['id']]); } if ($link_js['target'] == -1) - continue; + unset($links_js[$link_js['id']]); if ($link_js['source'] == -1) - continue; + unset($links_js[$link_js['id']]); if ($link_js['target'] == $link_js['source']) + unset($links_js[$link_js['id']]); + if($link_js['arrow_start'] == 'module' && $link_js['arrow_end'] == 'module'){ + echo "networkmap.links.push(" . json_encode($link_js) . ");\n"; + $array_aux[$link_js['id_agent_start']] =1; + unset($links_js[$link_js['id']]); + } + } + + foreach ($links_js as $link_js) { + if(($link_js['id_agent_end'] === 0) && $array_aux[$link_js['id_agent_start']] === 1 ){ continue; - echo "networkmap.links.push(" . json_encode($link_js) . ");\n"; + } else { + echo "networkmap.links.push(" . json_encode($link_js) . ");\n"; + } } echo "\n";