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

Merge pull request #6687 from owncloud/sharing-fixpartfilehandling 

Removed special handling of part files in shared storage rename
This commit is contained in:
Vincent Petry 2014-01-09 06:16:43 -08:00
parent e0dbc1b67e 8eaa39f4e2
commit b24c21b00f
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
apps/files_sharing/lib/sharedstorage.php
View File

@ -293,29 +293,20 @@ class Shared extends \OC\Files\Storage\Common {
} }
public function rename($path1, $path2) { public function rename($path1, $path2) {
// Check for partial files // Renaming/moving is only allowed within shared folders
if (pathinfo($path1, PATHINFO_EXTENSION) === 'part') { $pos1 = strpos($path1, '/', 1);
if ($oldSource = $this->getSourcePath($path1)) { $pos2 = strpos($path2, '/', 1);
if ($pos1 !== false && $pos2 !== false && ($oldSource = $this->getSourcePath($path1))) {
$newSource = $this->getSourcePath(dirname($path2)) . '/' . basename($path2);
// Within the same folder, we only need UPDATE permissions
if (dirname($path1) == dirname($path2) and $this->isUpdatable($path1)) {
list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource); list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource);
$newInternalPath = substr($oldInternalPath, 0, -5); list(, $newInternalPath) = \OC\Files\Filesystem::resolvePath($newSource);
return $storage->rename($oldInternalPath, $newInternalPath); return $storage->rename($oldInternalPath, $newInternalPath);
} // otherwise DELETE and CREATE permissions required
} else { } elseif ($this->isDeletable($path1) && $this->isCreatable(dirname($path2))) {
// Renaming/moving is only allowed within shared folders $rootView = new \OC\Files\View('');
$pos1 = strpos($path1, '/', 1); return $rootView->rename($oldSource, $newSource);
$pos2 = strpos($path2, '/', 1);
if ($pos1 !== false && $pos2 !== false && ($oldSource = $this->getSourcePath($path1))) {
$newSource = $this->getSourcePath(dirname($path2)) . '/' . basename($path2);
// Within the same folder, we only need UPDATE permissions
if (dirname($path1) == dirname($path2) and $this->isUpdatable($path1)) {
list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource);
list(, $newInternalPath) = \OC\Files\Filesystem::resolvePath($newSource);
return $storage->rename($oldInternalPath, $newInternalPath);
// otherwise DELETE and CREATE permissions required
} elseif ($this->isDeletable($path1) && $this->isCreatable(dirname($path2))) {
$rootView = new \OC\Files\View('');
return $rootView->rename($oldSource, $newSource);
}
} }
} }
return false; return false;

5
lib/private/connector/sabre/file.php
View File

@ -242,7 +242,10 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
$fileExists = $fs->file_exists($targetPath); $fileExists = $fs->file_exists($targetPath);
if ($renameOkay === false || $fileExists === false) { if ($renameOkay === false || $fileExists === false) {
\OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR); \OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
$fs->unlink($targetPath); // only delete if an error occurred and the target file was already created
if ($fileExists) {
$fs->unlink($targetPath);
}
throw new Sabre_DAV_Exception(); throw new Sabre_DAV_Exception();
} }