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

refactor: Moved ifLabel -> cleanPort and updated the usage (#6288)

Browse Source 
* refactor: Moved ifLabel -> cleanPort and updated the usage

* added list of tags allowed

* few updates as per comments from @murrant

* Added simple unit tests

* double display for javascript popover

* Remove ifNameDescr() function
Fix realtime port page

* remove accidental temp code

* Remove double display calls in ajax tables
This commit is contained in:
Neil Lathwood
2017-04-04 08:08:23 +01:00
committed by GitHub
parent b1c2ea2194
commit 1bbbaff58b
54 changed files with 137 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
html/includes/functions.inc.php
View File

@@ -610,7 +610,7 @@ function generate_port_link($port, $text = null, $type = null, $overlib = 1, $si
global $config;
$graph_array = array();
$port = ifNameDescr($port);
if (!$text) {
$text = fixifName($port['label']);
}
@@ -629,9 +629,9 @@ function generate_port_link($port, $text = null, $type = null, $overlib = 1, $si
$port = array_merge($port, device_by_id_cache($port['device_id']));
}
$content = '<div class=list-large>'.$port['hostname'].' - '.fixifName($port['label']).'</div>';
$content = '<div class=list-large>'.$port['hostname'].' - '.fixifName(addslashes(display($port['label']))).'</div>';
if ($port['ifAlias']) {
$content .= display($port['ifAlias']).'<br />';
$content .= addslashes(display($port['ifAlias'])).'<br />';
}
$content .= "<div style=\'width: 850px\'>";
@@ -1139,6 +1139,7 @@ function alert_details($details)
}
if ($tmp_alerts['port_id']) {
$tmp_alerts = cleanPort($tmp_alerts);
$fault_detail .= generate_port_link($tmp_alerts).';&nbsp;';
$fallback = false;
}