From 0da3cb89969e2fb9206a7f120c093afb72dfae18 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Sun, 29 Mar 2015 02:11:55 +0100
Subject: [PATCH] Fix for maps now working when devices hostname != the same in
 the links table

---
 html/includes/print-map.inc.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/html/includes/print-map.inc.php b/html/includes/print-map.inc.php
index d216be5a5a..d096a5ceb1 100644
--- a/html/includes/print-map.inc.php
+++ b/html/includes/print-map.inc.php
@@ -42,13 +42,13 @@ $nodes = json_encode($tmp_devices);
  
 if (is_array($tmp_devices[0])) {
     $tmp_links = array();
-    foreach (dbFetchRows("SELECT `devices`.`hostname` AS `hostname`, `remote_hostname`,`ports`.`ifName` AS `local_port`, `remote_port`,`ports`.`ifSpeed` AS ifSpeed FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` WHERE (`local_device_id` IN ($tmp_ids) AND `remote_device_id` IN ($tmp_ids))") as $link_devices) {
+    foreach (dbFetchRows("SELECT local_device_id, remote_device_id, `remote_hostname`,`ports`.`ifName` AS `local_port`, `remote_port`,`ports`.`ifSpeed` AS ifSpeed FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` WHERE (`local_device_id` IN ($tmp_ids) AND `remote_device_id` IN ($tmp_ids))") as $link_devices) {
         foreach ($tmp_devices as $k=>$v) {
-            if ($v['label'] == $link_devices['hostname']) {
+            if ($v['id'] == $link_devices['local_device_id']) {
                 $from = $v['id'];
                 $port = $link_devices['local_port'];
             }
-            if ($v['label'] == $link_devices['remote_hostname']) {
+            if ($v['id'] == $link_devices['remote_device_id']) {
                 $to = $v['id'];
                 $port .= ' > ' .$link_devices['remote_port'];
             }
@@ -75,6 +75,7 @@ if (is_array($tmp_devices[0])) {
 ?>
  
 <div id="visualization"></div>
+<script src="js/vis.min.js"></script>
 <script type="text/javascript">
 
     // create an array with nodes