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

* 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

View File

@@ -150,6 +150,7 @@ if ($_SESSION['userlevel'] >= '5') {
unset($seperator);
foreach ($ports[$device['vrf_id']][$device['device_id']] as $port) {
$port = cleanPort($port);
$port = array_merge($device, $port);
switch ($_GET['optc']) {
@@ -167,7 +168,7 @@ if ($_SESSION['userlevel'] >= '5') {
text-align: center; float: left; background-color: ".$list_colour_b_b.";'>
<div style='font-weight: bold;'>".makeshortif($port['ifDescr']).'</div>';
print_port_thumbnail($port);
echo "<div style='font-size: 9px;'>".substr(short_port_descr(display($port['ifAlias'])), 0, 22).'</div>
echo "<div style='font-size: 9px;'>".substr(short_port_descr($port['ifAlias']), 0, 22).'</div>
</div>';
break;