From a9ca7b6a8d89cf07a143b379cf603e0e98b6bb10 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Fri, 7 Jul 2017 13:21:05 +0200 Subject: [PATCH] Added a virgensita de guadalupe fix to generate networkmaps in windows systems --- .../include/functions_pandora_networkmap.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php index d3aa1fb339..641f9e850b 100644 --- a/pandora_console/include/functions_pandora_networkmap.php +++ b/pandora_console/include/functions_pandora_networkmap.php @@ -148,8 +148,9 @@ function networkmap_process_networkmap($id = 0) { case "WINNT": case "Windows": $filename_plain = sys_get_temp_dir() . "\\plain.txt"; - $cmd = $config['graphviz_bin_dir'] . "\\$filter -Tplain -o " . $filename_plain . " " . - $filename_dot; + + $cmd = io_safe_output($config['graphviz_bin_dir'] . "\\$filter.exe -Tplain -o " . $filename_plain . " " . + $filename_dot); break; default: $filename_plain = sys_get_temp_dir() . "/plain.txt"; @@ -157,7 +158,7 @@ function networkmap_process_networkmap($id = 0) { $filename_dot; break; } - + system ($cmd); unlink($filename_dot); @@ -165,6 +166,8 @@ function networkmap_process_networkmap($id = 0) { $nodes = networkmap_loadfile($id, $filename_plain, $relation_nodes, $graph); + unlink($filename_plain); + //Set the position of modules foreach ($nodes as $key => $node) { if ($node['type'] == 'module') { @@ -265,8 +268,6 @@ function networkmap_process_networkmap($id = 0) { db_process_sql_update('tmap', array('center_x' => $networkmap['center_x'], 'center_y' => $networkmap['center_y']), array('id' => $id)); - - unlink($filename_plain); } return $nodes_and_relations;