BUG 6692 Adjustment to verify if the folder exists

This commit is contained in:
Hector Cortez
2011-04-15 17:40:54 -04:00
parent c31ee9c6fe
commit 5afcbef481

View File

@@ -1031,22 +1031,25 @@ class RBAC
private function getAllFiles($directory, $recursive = true ) { private function getAllFiles($directory, $recursive = true ) {
$result = array(); $result = array();
$handle = opendir($directory); if (is_dir($directory))
while ($datei = readdir($handle))
{ {
if (($datei != '.') && ($datei != '..')) $handle = opendir($directory);
{ while ($datei = readdir($handle))
$file = $directory.$datei; {
if (is_dir($file)) { if (($datei != '.') && ($datei != '..'))
if ($recursive) { {
$result = array_merge($result, getAllFiles($file.'/')); $file = $directory.$datei;
} if (is_dir($file)) {
} else { if ($recursive) {
$result[] = $file; $result = array_merge($result, getAllFiles($file.'/'));
} }
} } else {
$result[] = $file;
}
}
}
closedir($handle);
} }
closedir($handle);
return $result; return $result;
} }