From 7598d75ad4f057ec7b486bc487fb1bda5cc3d4b0 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sat, 23 Apr 2011 14:54:14 +0000 Subject: [PATCH] no link if device is unknown on map, and add a few more extreme device types git-svn-id: http://www.observium.org/svn/observer/trunk@2148 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/map.php | 2 +- includes/rewrites.php | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/html/map.php b/html/map.php index 680ddc4c0..732a7fb96 100755 --- a/html/map.php +++ b/html/map.php @@ -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']; + unset($dst_host); $dst = $link['remote_hostname']; } diff --git a/includes/rewrites.php b/includes/rewrites.php index e8726462f..d4c4b01e3 100644 --- a/includes/rewrites.php +++ b/includes/rewrites.php @@ -301,6 +301,13 @@ $rewrite_extreme_hardware = array ( '.1.3.6.1.4.1.1916.2.87' => 'Summit X450a-48tDC', '.1.3.6.1.4.1.1916.2.72' => 'Summit X450e-24p', '.1.3.6.1.4.1.1916.2.79' => 'Summit X450e-48p' +'.1.3.6.1.4.1.1916.2.62' => 'Black Diamond 8810', +'.1.3.6.1.4.1.1916.2.67' => 'SummitStack', +'.1.3.6.1.4.1.1916.2.100' => 'Summit x150-24t', +'.1.3.6.1.4.1.1916.2.114' => 'Summit x650-24x', +'.1.3.6.1.4.1.1916.2.129' => 'NWI-e450a', +'.1.3.6.1.4.1.1916.2.133' => 'Summit x480-48t' +'.1.3.6.1.4.1.1916.2.141' => 'Summit x480-48x', ); $rewrite_ironware_hardware = array(