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

minor fix 

Former-commit-id: 55b56db7a7ca1eee5d48731269d2894425037e3b
This commit is contained in:
fbsanchez 2019-03-22 16:00:01 +01:00
parent 732fdafc14
commit 091e2db13a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/include/class/NetworkMap.class.php
View File

@ -867,12 +867,12 @@ class NetworkMap
// Add also parent relationship. // Add also parent relationship.
$parent_id = NODE_AGENT.'_'.$node['id_parent']; $parent_id = NODE_AGENT.'_'.$node['id_parent'];
if (is_integer($parent_id)) { if ((int) $node['id_parent'] > 0) {
$parent_node = $this->nodes[$parent_id]['id_node']; $parent_node = $this->nodes[$parent_id]['id_node'];
} }
// Store relationship. // Store relationship.
if ($parent_node && $node['id_parent'] > 0) { if (is_integer($parent_node) && $node['id_parent'] > 0) {
$rel = []; $rel = [];
// Node reference (parent). // Node reference (parent).
@ -956,8 +956,11 @@ class NetworkMap
// Add also parent relationship. // Add also parent relationship.
$parent_id = $node['id_parent']; $parent_id = $node['id_parent'];
if (is_integer($parent_id)) { if ((int) $parent_id > 0) {
$parent_node = $this->getNodeData($parent_id, 'id_node'); $parent_node = $this->getNodeData(
(int) $parent_id,
'id_node'
);
} }
// Store relationship. // Store relationship.
@ -2061,6 +2064,8 @@ class NetworkMap
// Store relationships. // Store relationships.
$this->relations = array_merge($edges, $orphans); $this->relations = array_merge($edges, $orphans);
} else {
$this->relations = $edges;
} }
// Close dot file. // Close dot file.
@ -3166,7 +3171,7 @@ class NetworkMap
var arrows = networkmap.links; var arrows = networkmap.links;
var width = networkmap_dimensions[0]; var width = networkmap_dimensions[0];
var height = networkmap_dimensions[1]; var height = networkmap_dimensions[1];
var font_size = 14; var font_size = '.$this->mapOptions['font_size'].';
var custom_params = '.json_encode($this->tooltipParams).'; var custom_params = '.json_encode($this->tooltipParams).';
var controller = null; var controller = null;
var homedir = "'.ui_get_full_url(false).'" var homedir = "'.ui_get_full_url(false).'"