Merge pull request #1202 from paulgear/minor-tidies

Minor tidies

contrib/findit

@@ -9,4 +9,4 @@ find . \
 	-path ./mibs -prune -o \
 	-path ./rrd -prune -o \
 	-name .git -prune -o \
-		-type f -print|xargs grep "$@"
+		-type f -print0|xargs -0 grep "$@"

html/includes/graphs/accesspoints/channel.inc.php

@@ -1,6 +1,7 @@
 <?php
 
-$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/". safename("arubaap-$ap[name].$ap[radio_number].rrd");
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] ."/".
+safename("arubaap-$ap[name].$ap[radio_number].rrd");
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = "Channel";

includes/definitions.inc.php

@@ -670,13 +670,6 @@ $config['os'][$os]['text']              = "D-Link Access Point";
 $config['os'][$os]['type']              = "wireless";
 $config['os'][$os]['icon']              = "dlink";
 
-//$os = "ubiquitiap";
-//$config['os'][$os]['text']              = "Ubiquiti Networks Wireless";
-//$config['os'][$os]['type']              = "wireless";
-//$config['os'][$os]['icon']              = "ubiquiti";
-//$config['os'][$os]['over'][0]['graph']  = "device_bits";
-//$config['os'][$os]['over'][0]['text']   = "Device Traffic";
-
 $os = "axiscam";
 $config['os'][$os]['text']              = "AXIS Network Camera";
 $config['os'][$os]['icon']              = "axis";

includes/polling/ports.inc.php

@@ -215,7 +215,7 @@ foreach ($ports as $port)
       $this_port['ifOutMulticastPkts'] = $this_port['ifHCOutMulticastPkts'];
     }
 
-    // Overwrite ifSpeed with ifHighSpeed if it's over 10G
+    // Overwrite ifSpeed with ifHighSpeed if it's over 1G
     if (is_numeric($this_port['ifHighSpeed']) && $this_port['ifSpeed'] > "1000000000")
     {
       echo("HighSpeed ");