From e5513d2a3df9ea13693a4ed10b4b57bb232a6178 Mon Sep 17 00:00:00 2001 From: Pim van den Berg Date: Sat, 9 Feb 2013 22:42:01 +0100 Subject: inc/collectd.inc.php: remove . and .. from scandir before foreach Reported-by: Reza (http://pommi.nethuis.nl/collectd-graph-panel-v0-3/#comment-26990) --- inc/collectd.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/collectd.inc.php') diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php index 99ffdd1..56c5a2d 100644 --- a/inc/collectd.inc.php +++ b/inc/collectd.inc.php @@ -11,9 +11,9 @@ function collectd_hosts() { if (!is_dir($CONFIG['datadir'])) return false; - $dir = scandir($CONFIG['datadir']); + $dir = array_diff(scandir($CONFIG['datadir']), array('.', '..')); foreach($dir as $k => $v) { - if(!is_dir($CONFIG['datadir'].'/'.$v) || $v == '.' || $v == '..') + if(!is_dir($CONFIG['datadir'].'/'.$v)) unset($dir[$k]); } return($dir); -- cgit v1.1