Fixed FTP and SMB to use rmdir() when deleting folders

Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().

Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)

Note that the extra is_dir() should be fast because it's read from the
stat cache.

1 files changed, 9 insertions, 3 deletions

diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 5bff597fdca..c5fba92ee68 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -82,12 +82,18 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 	}
 
 	/**
-	 * Unlinks file
+	 * Unlinks file or directory
 	 * @param string @path
 	 */
 	public function unlink($path) {
-		unlink($this->constructUrl($path));
-		clearstatcache();
+		if ($this->is_dir($path)) {
+			$this->rmdir($path);
+		}
+		else {
+			$url = $this->constructUrl($path);
+			unlink($url);
+			clearstatcache(false, $url);
+		}
 		// smb4php still returns false even on success so
 		// check here whether file was really deleted
 		return !file_exists($path);