From c27cb9d803e4980089b9366491e119d19f0e85d9 Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Wed, 27 May 2015 00:17:00 +1000 Subject: [PATCH 1/4] Source tree has files with spaces in their names now --- contrib/findit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/findit b/contrib/findit index a6407b63d..6c89281ca 100755 --- a/contrib/findit +++ b/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 "$@" From 418416457be173fe8eea9b16df43bafc66cfdc7a Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Sun, 31 May 2015 17:45:04 +1000 Subject: [PATCH 2/4] Make source layout consistent with all the other aruba files --- html/includes/graphs/accesspoints/channel.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/html/includes/graphs/accesspoints/channel.inc.php b/html/includes/graphs/accesspoints/channel.inc.php index e05d580d2..03b0dd24c 100644 --- a/html/includes/graphs/accesspoints/channel.inc.php +++ b/html/includes/graphs/accesspoints/channel.inc.php @@ -1,6 +1,7 @@ Date: Tue, 2 Jun 2015 23:54:00 +1000 Subject: [PATCH 3/4] Remove unused os type --- includes/definitions.inc.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 4c3972544..321de6826 100644 --- a/includes/definitions.inc.php +++ b/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"; From 49833273e79f8de3015ec1ddd2859b80770c0e37 Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Sat, 6 Jun 2015 07:50:23 +1000 Subject: [PATCH 4/4] Make comment reflect code --- includes/polling/ports.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index 03896c69c..429fde3cd 100644 --- a/includes/polling/ports.inc.php +++ b/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 ");