diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index c1f282fc64..3502ded2f7 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -737,4 +737,13 @@ function get_client_ip() { return $client_ip; } +function shorten_interface_type($string) { + + return str_ireplace( + array('FastEthernet','GigbitEthernet','TenGigabitEthernet','Port-Channel','Ethernet'), + array('Fa','Gi','Te','Po','Eth'), + $string + ); +} + ?> diff --git a/html/includes/print-map.inc.php b/html/includes/print-map.inc.php index d096a5ceb1..cb574f9412 100644 --- a/html/includes/print-map.inc.php +++ b/html/includes/print-map.inc.php @@ -46,11 +46,11 @@ if (is_array($tmp_devices[0])) { foreach ($tmp_devices as $k=>$v) { if ($v['id'] == $link_devices['local_device_id']) { $from = $v['id']; - $port = $link_devices['local_port']; + $port = shorten_interface_type($link_devices['local_port']); } if ($v['id'] == $link_devices['remote_device_id']) { $to = $v['id']; - $port .= ' > ' .$link_devices['remote_port']; + $port .= ' > ' .shorten_interface_type($link_devices['remote_port']); } } $speed = $link_devices['ifSpeed']/1000/1000; diff --git a/includes/rrdtool.inc.php b/includes/rrdtool.inc.php index 2a23caaa47..d00d5105ed 100644 --- a/includes/rrdtool.inc.php +++ b/includes/rrdtool.inc.php @@ -264,13 +264,4 @@ function rrdtool_escape($string, $maxlength = NULL) } } -function shorten_interface_type($string) { - - return str_ireplace( - array('FastEthernet','GigbitEthernet','TenGigabitEthernet','Port-Channel','Ethernet'), - array('Fa','Gi','Te','Po','Eth'), - $string - ); -} - ?>