fixed dir-listing: don't error when dir is unreadable & if more than 100 dirs fall back to manual dir-selection; fixed #2

This commit is contained in:
Michael Kaufmann (d00p)
2010-01-24 15:05:21 +00:00
parent 688440d62e
commit b3f9303f87
4 changed files with 29 additions and 8 deletions

View File

@@ -43,10 +43,20 @@ function findDirs($path, $uid, $gid)
{
$path = array_pop($list);
$path = makeCorrectDir($path);
if(!is_readable($path))
{
return $_fileList;
}
$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;
}