Merge pull request #1296 from SaaldjorMike/fix-legend-iflabels

Fix legend iflabels
librenms · Jun 18, 2015 · 559d696 · 559d696
2 parents b690f6f + 442f052
commit 559d696
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
@@ -763,8 +763,8 @@ function get_client_ip() {
 function shorten_interface_type($string) {
 
     return str_ireplace(
-               array('FastEthernet','GigbitEthernet','TenGigabitEthernet','Port-Channel','Ethernet'),
-               array('Fa','Gi','Te','Po','Eth'),
+               array('FastEthernet','TenGigabitEthernet','GigabitEthernet','Port-Channel','Ethernet'),
+               array('Fa','Te','Gi','Po','Eth'),
                $string
            );
 }

diff --git a/html/includes/graphs/device/bits.inc.php b/html/includes/graphs/device/bits.inc.php
@@ -36,7 +36,7 @@
 
     $rrd_filenames[] = $rrd_filename;
     $rrd_list[$i]['filename'] = $rrd_filename;
-    $rrd_list[$i]['descr'] = $port['label'];
+    $rrd_list[$i]['descr'] = shorten_interface_type($port['label']);
     $rrd_list[$i]['descr_in'] = $port['label'];
     $rrd_list[$i]['descr_out'] = $port['ifAlias'];
     $rrd_list[$i]['ds_in'] = $ds_in;