nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-01 00:24:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #689 from laf/issue-688

Browse Source 
Fix for maps now working when devices hostname != the same in the links table
This commit is contained in:
Daniel Preussker
2015-03-31 09:41:51 +02:00
parent f5e7e504b4 0da3cb8996
commit 3d4284eed0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/print-map.inc.php
+3 -3
View File
@@ -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'];
}