use ifNameDescr in map, so powerconnect has useful interface names, remove powerconnect from ifdescr whitelist

git-svn-id: http://www.observium.org/svn/observer/trunk@602 61d68cd4-352d-0410-923a-c4978735b2b8

includes/rewrites.php

@@ -11,9 +11,9 @@ function ifNameDescr ($interface, $device = NULL) {
   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'];
+  } else {
+    $interface['label'] = $interface['ifName'];
   }
   return $interface;
 

includes/static-config.php

@@ -4,7 +4,6 @@
 $config['ifname']['asa'] = true;
 $config['ifname']['catos'] = true;
 $config['ifname']['windows'] = true;
-$config['ifname']['powerconnect'] = true;
 $config['ifname']['speedtouch'] = true;
 
 ## AFI / SAFI pairs for BGP (and other stuff, perhaps)