mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8377 from youngguns-nl/issue_8376 

RecursiveDirectoryIterator does not work on NFS
This commit is contained in:
Vincent Petry 2014-05-02 18:45:09 +02:00
parent 49d9631eee 49822dfcdb
commit 9e18be6422
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/files_trashbin/lib/trashbin.php
View File

@ -883,11 +883,19 @@ class Trashbin {
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST); $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST);
$size = 0; $size = 0;
foreach ($iterator as $path) { /**
* RecursiveDirectoryIterator on an NFS path isn't iterable with foreach
* This bug is fixed in PHP 5.5.9 or before
* See #8376
*/
$iterator->rewind();
while ($iterator->valid()) {
$path = $iterator->current();
$relpath = substr($path, strlen($root) - 1); $relpath = substr($path, strlen($root) - 1);
if (!$view->is_dir($relpath)) { if (!$view->is_dir($relpath)) {
$size += $view->filesize($relpath); $size += $view->filesize($relpath);
} }
$iterator->next();
} }
return $size; return $size;
} }

11
lib/private/files/storage/local.php
View File

@ -44,17 +44,26 @@ if (\OC_Util::runningOnWindows()) {
new \RecursiveDirectoryIterator($this->datadir . $path), new \RecursiveDirectoryIterator($this->datadir . $path),
\RecursiveIteratorIterator::CHILD_FIRST \RecursiveIteratorIterator::CHILD_FIRST
); );
foreach ($it as $file) { /**
* RecursiveDirectoryIterator on an NFS path isn't iterable with foreach
* This bug is fixed in PHP 5.5.9 or before
* See #8376
*/
$it->rewind();
while ($it->valid()) {
/** /**
* @var \SplFileInfo $file * @var \SplFileInfo $file
*/ */
$file = $it->current();
if (in_array($file->getBasename(), array('.', '..'))) { if (in_array($file->getBasename(), array('.', '..'))) {
$it->next();
continue; continue;
} elseif ($file->isDir()) { } elseif ($file->isDir()) {
rmdir($file->getPathname()); rmdir($file->getPathname());
} elseif ($file->isFile() || $file->isLink()) { } elseif ($file->isFile() || $file->isLink()) {
unlink($file->getPathname()); unlink($file->getPathname());
} }
$it->next();
} }
return rmdir($this->datadir . $path); return rmdir($this->datadir . $path);
} catch (\UnexpectedValueException $e) { } catch (\UnexpectedValueException $e) {

11
lib/private/files/storage/mappedlocal.php
View File

@ -39,17 +39,26 @@ class MappedLocal extends \OC\Files\Storage\Common{
new \RecursiveDirectoryIterator($this->buildPath($path)), new \RecursiveDirectoryIterator($this->buildPath($path)),
\RecursiveIteratorIterator::CHILD_FIRST \RecursiveIteratorIterator::CHILD_FIRST
); );
foreach ($it as $file) { /**
* RecursiveDirectoryIterator on an NFS path isn't iterable with foreach
* This bug is fixed in PHP 5.5.9 or before
* See #8376
*/
$it->rewind();
while ($it->valid()) {
/** /**
* @var \SplFileInfo $file * @var \SplFileInfo $file
*/ */
$file = $it->current();
if (in_array($file->getBasename(), array('.', '..'))) { if (in_array($file->getBasename(), array('.', '..'))) {
$it->next();
continue; continue;
} elseif ($file->isDir()) { } elseif ($file->isDir()) {
rmdir($file->getPathname()); rmdir($file->getPathname());
} elseif ($file->isFile() || $file->isLink()) { } elseif ($file->isFile() || $file->isLink()) {
unlink($file->getPathname()); unlink($file->getPathname());
} }
$it->next();
} }
if ($result = @rmdir($this->buildPath($path))) { if ($result = @rmdir($this->buildPath($path))) {
$this->cleanMapper($path); $this->cleanMapper($path);