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

Merge pull request #6123 from owncloud/extstorage-deletedirs2 

Fixed FTP and SMB to use rmdir() when deleting folders
This commit is contained in:
Vincent Petry 2013-11-29 11:23:02 -08:00
parent 338a55e36c d69243ee51
commit baa587fd3c
4 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/files_external/lib/ftp.php
View File

@ -61,6 +61,22 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
$url.='://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path;
return $url;
}
/**
* Unlinks file or directory
* @param string @path
*/
public function unlink($path) {
if ($this->is_dir($path)) {
return $this->rmdir($path);
}
else {
$url = $this->constructUrl($path);
$result = unlink($url);
clearstatcache(true, $url);
return $result;
}
}
public function fopen($path,$mode) {
switch($mode) {
case 'r':

12
apps/files_external/lib/smb.php
View File

@ -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);

12
apps/files_external/lib/streamwrapper.php
View File

@ -25,8 +25,9 @@ abstract class StreamWrapper extends Common {
$this->unlink($path . '/' . $file);
}
}
$success = rmdir($this->constructUrl($path));
clearstatcache();
$url = $this->constructUrl($path);
$success = rmdir($url);
clearstatcache(false, $url);
return $success;
} else {
return false;
@ -46,8 +47,11 @@ abstract class StreamWrapper extends Common {
}
public function unlink($path) {
$success = unlink($this->constructUrl($path));
clearstatcache();
$url = $this->constructUrl($path);
$success = unlink($url);
// normally unlink() is supposed to do this implicitly,
// but doing it anyway just to be sure
clearstatcache(false, $url);
return $success;
}

14
tests/lib/files/storage/storage.php
View File

@ -254,7 +254,19 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
$this->instance->mkdir('folder/bar');
$this->instance->file_put_contents('folder/asd.txt', 'foobar');
$this->instance->file_put_contents('folder/bar/foo.txt', 'asd');
$this->instance->rmdir('folder');
$this->assertTrue($this->instance->rmdir('folder'));
$this->assertFalse($this->instance->file_exists('folder/asd.txt'));
$this->assertFalse($this->instance->file_exists('folder/bar/foo.txt'));
$this->assertFalse($this->instance->file_exists('folder/bar'));
$this->assertFalse($this->instance->file_exists('folder'));
}
public function testRecursiveUnlink() {
$this->instance->mkdir('folder');
$this->instance->mkdir('folder/bar');
$this->instance->file_put_contents('folder/asd.txt', 'foobar');
$this->instance->file_put_contents('folder/bar/foo.txt', 'asd');
$this->assertTrue($this->instance->unlink('folder'));
$this->assertFalse($this->instance->file_exists('folder/asd.txt'));
$this->assertFalse($this->instance->file_exists('folder/bar/foo.txt'));
$this->assertFalse($this->instance->file_exists('folder/bar'));