From 2b744b81b1b83c8c624f659d7ecf7cae6172ec80 Mon Sep 17 00:00:00 2001 From: laf Date: Sat, 18 Apr 2015 15:47:07 +0100 Subject: [PATCH] Updated to use new overlib variable --- html/includes/print-map.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/html/includes/print-map.inc.php b/html/includes/print-map.inc.php index 297bac1b6c..453a305f15 100644 --- a/html/includes/print-map.inc.php +++ b/html/includes/print-map.inc.php @@ -26,11 +26,11 @@ $tmp_ids = array(); foreach (dbFetchRows("SELECT DISTINCT least(`devices`.`device_id`, `remote_device_id`) AS `remote_device_id`, GREATEST(`remote_device_id`,`devices`.`device_id`) AS `local_device_id` FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` $sql", $sql_array) as $link_devices) { if (!in_array($link_devices['local_device_id'], $tmp_ids) && device_permitted($link_devices['local_device_id'])) { $link_dev = dbFetchRow("SELECT * FROM `devices` WHERE `device_id`=?",array($link_devices['local_device_id'])); - $tmp_devices[] = array('id'=>$link_devices['local_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',1),'group'=>$link_dev['location'],'shape'=>'box'); + $tmp_devices[] = array('id'=>$link_devices['local_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',0),'group'=>$link_dev['location'],'shape'=>'box'); } if (!in_array($link_devices['remote_device_id'], $tmp_ids) && device_permitted($link_devices['remote_device_id'])) { $link_dev = dbFetchRow("SELECT * FROM `devices` WHERE `device_id`=?",array($link_devices['remote_device_id'])); - $tmp_devices[] = array('id'=>$link_devices['remote_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',1),'group'=>$link_dev['location'],'shape'=>'box'); + $tmp_devices[] = array('id'=>$link_devices['remote_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',0),'group'=>$link_dev['location'],'shape'=>'box'); } array_push($tmp_ids,$link_devices['local_device_id']); array_push($tmp_ids,$link_devices['remote_device_id']); @@ -81,7 +81,7 @@ if (is_array($tmp_devices[0])) { } $link_color = $config['map_legend'][$link_used]; - $tmp_links[] = array('from'=>$from,'to'=>$to,'label'=>$port,'title'=>generate_port_link($port_data, "",'',1,1),'width'=>$width,'color'=>$link_color); + $tmp_links[] = array('from'=>$from,'to'=>$to,'label'=>$port,'title'=>generate_port_link($port_data, "",'',0,1),'width'=>$width,'color'=>$link_color); } $edges = json_encode($tmp_links);