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

re-work findDirs()-function

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-12-16 15:14:57 +01:00
parent cd5e8801e4
commit 1e5f80ace6
1 changed files with 19 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,70 +21,33 @@
* Returns an array of found directories * Returns an array of found directories
* *
* This function checks every found directory if they match either $uid or $gid, if they do * This function checks every found directory if they match either $uid or $gid, if they do
* the found directory is valid. It uses recursive function calls to find subdirectories. Due * the found directory is valid. It uses recursive-iterators to find subdirectories.
* to the recursive behauviour this function may consume much memory.
* *
* @param string path The path to start searching in * @param string $path the path to start searching in
* @param integer uid The uid which must match the found directories * @param int $uid the uid which must match the found directories
* @param integer gid The gid which must match the found direcotries * @param int $gid the gid which must match the found direcotries
* @param array _fileList recursive transport array !for internal use only!
* @return array Array of found valid pathes
* *
* @author Martin Burchert <martin.burchert@syscp.de> * @return array Array of found valid pathes
* @author Manuel Bernhardt <manuel.bernhardt@syscp.de>
*/ */
function findDirs($path, $uid, $gid) {
function findDirs($path, $uid, $gid) $_fileList = array ();
{ $path = makeCorrectDir($path);
$list = array(
$path
);
$_fileList = array();
while(sizeof($list) > 0) // valid directory?
{ if (is_dir($path)) {
$path = array_pop($list); // create RecursiveIteratorIterator
$path = makeCorrectDir($path); $its = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path));
if(!is_readable($path) || !is_executable($path)) // check every file
{ foreach ($its as $fullFileName => $it) {
//return $_fileList; if ($it->isDir()
// only 'skip' this directory, #611 && (fileowner($fullFileName) == $uid || filegroup($fullFileName) == $gid)
continue; ) {
} $_fileList[] = makeCorrectDir(dirname($fullFileName));
$dh = opendir($path);
if($dh === false)
{
/*
* this should never be called because we checked
* 'is_readable' before...but we never know what might happen
*/
standard_error('cannotreaddir', $path);
return null;
}
else
{
while(false !== ($file = @readdir($dh)))
{
if($file == '.'
&& (fileowner($path . '/' . $file) == $uid || filegroup($path . '/' . $file) == $gid))
{
$_fileList[] = makeCorrectDir($path);
}
if(is_dir($path . '/' . $file)
&& $file != '..'
&& $file != '.')
{
array_push($list, $path . '/' . $file);
}
} }
@closedir($dh);
} }
} }
return $_fileList; return array_unique($_fileList);
} }