git-svn-id: http://www.observium.org/svn/observer/trunk@528 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-11-21 15:07:09 +00:00
parent 79bf6e81b5
commit 64368223a0
15 changed files with 783 additions and 856 deletions

View File

@@ -6,18 +6,15 @@ function formatMac($mac) {
}
function ifNameDescr ($interface, $device) {
# echo($device['os']);
if(!$config['ifname'][$device['os']]) {
$interface['label'] = $interface['ifDescr'];
} else {
function ifNameDescr ($interface, $device = NULL) {
global $config;
if(!$device) { $device = device_array($interface['device_id']); }
$os = strtolower($device['os']);
if($config['ifname'][$os]) {
$interface['label'] = $interface['ifName'];
} else {
$interface['label'] = $interface['ifDescr'];
}
# unset ($interface['ifDescr']);
# unset ($interface['ifName']);
return $interface;
}