Make rmdir recursive for local storage

Backport of 63c898c0

1 files changed, 21 insertions, 1 deletions

diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index f4d7626219b..a6fe01c63d6 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -34,7 +34,27 @@ class Local extends \OC\Files\Storage\Common{
 		return @mkdir($this->datadir.$path);
 	}
 	public function rmdir($path) {
-		return @rmdir($this->datadir.$path);
+		try {
+			$it = new \RecursiveIteratorIterator(
+				new \RecursiveDirectoryIterator($this->datadir . $path),
+				\RecursiveIteratorIterator::CHILD_FIRST
+			);
+			foreach ($it as $file) {
+				/**
+				 * @var \SplFileInfo $file
+				 */
+				if (in_array($file->getBasename(), array('.', '..'))) {
+					continue;
+				} elseif ($file->isDir()) {
+					rmdir($file->getPathname());
+				} elseif ($file->isFile() || $file->isLink()) {
+					unlink($file->getPathname());
+				}
+			}
+			return rmdir($this->datadir . $path);
+		} catch (\UnexpectedValueException $e) {
+			return false;
+		}
 	}
 	public function opendir($path) {
 		return opendir($this->datadir.$path);