mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update to map

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2108 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-04-20 11:19:46 +00:00
parent c602fcfc94
commit d038a24ffe
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/map.php
+7 -3
View File
@@ -91,7 +91,7 @@ if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format']))
$dst = mysql_result(mysql_query("SELECT `hostname` FROM `devices` AS D, `ports` AS I WHERE I.interface_id = '$remote_interface_id' AND D.device_id = I.device_id"),0);
$dst_host = mysql_result(mysql_query("SELECT D.device_id FROM `devices` AS D, `ports` AS I WHERE I.interface_id = '$remote_interface_id' AND D.device_id = I.device_id"),0);
} else {
$dst_host = $link['remote_hostname'];
#$dst_host = $link['remote_hostname'];
$dst = $link['remote_hostname'];
}
@@ -111,7 +111,11 @@ if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format']))
$ifdone[$src][$sif['interface_id']] = 1;
}
$map .= "\"$dst\" [URL=\"{$config['base_url']}/device/$dst_host/map/\" fontsize=20 shape=box3d]\n";
if($dst_host) {
$map .= "\"$dst\" [URL=\"{$config['base_url']}/device/$dst_host/map/\" fontsize=20 shape=box3d]\n";
} else {
$map .= "\"$dst\" [ fontsize=20 shape=box3d]\n";
}
if ($dst_host == $device['device_id'] || $where == '')
{
@@ -177,4 +181,4 @@ else
}
}
?>
?>
includes/discovery/discovery-protocols.inc.php
+2 -1
View File
@@ -53,6 +53,7 @@ if ($cdp_array)
$remote_interface_id = @mysql_result(mysql_query("SELECT interface_id FROM `ports` WHERE (`ifDescr` = '$if' OR `ifName`='$if') AND `device_id` = '".$remote_device_id."'"),0);
} else { $remote_interface_id = "0"; }
if ($interface['interface_id'] && $cdp['cdpCacheDeviceId'] && $cdp['cdpCacheDevicePort'])
{
discover_link($interface['interface_id'], 'cdp', $remote_interface_id, $cdp['cdpCacheDeviceId'], $cdp['cdpCacheDevicePort'], $cdp['cdpCachePlatform'], $cdp['cdpCacheVersion']);
@@ -126,4 +127,4 @@ if ($query = mysql_query($sql))
unset($link_exists);
echo("\n");
?>
?>