maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

enhance findDirs() to avoid exceptions on unreadable directory

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-12-18 08:51:54 +01:00
parent b0c0918580
commit 687c5cea08
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/functions/filedir/function.findDirs.php
View File

@@ -36,18 +36,27 @@ function findDirs($path, $uid, $gid) {
// valid directory? // valid directory?
if (is_dir($path)) { if (is_dir($path)) {
// create RecursiveIteratorIterator try {
$its = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path)); // create RecursiveIteratorIterator
$its = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path));
// we can limit the recursion-depth, but will it be helpful or
// will people start asking "why do I only see 2 subdirectories, i want to use /a/b/c"
// let's keep this in mind and see whether it will be useful
// @TODO
// $its->setMaxDepth(2);
// check every file // check every file
foreach ($its as $fullFileName => $it) { foreach ($its as $fullFileName => $it) {
if ($it->isDir() if ($it->isDir() && (fileowner($fullFileName) == $uid || filegroup($fullFileName) == $gid)) {
&& (fileowner($fullFileName) == $uid || filegroup($fullFileName) == $gid) $_fileList[] = makeCorrectDir(dirname($fullFileName));
) { }
$_fileList[] = makeCorrectDir(dirname($fullFileName));
} }
} catch (UnexpectedValueException $e) {
// this is thrown if the directory is not found or not readble etc.
// just ignore and keep going
} }
} }
return array_unique($_fileList); return array_unique($_fileList);
} }