summaryrefslogtreecommitdiffstats
path: root/apps/dav/lib/Connector/Sabre/ObjectTree.php
diff options
context:
space:
mode:
Diffstat (limited to 'apps/dav/lib/Connector/Sabre/ObjectTree.php')
-rw-r--r--apps/dav/lib/Connector/Sabre/ObjectTree.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/dav/lib/Connector/Sabre/ObjectTree.php b/apps/dav/lib/Connector/Sabre/ObjectTree.php
index e292744cd2f..680c0e84fca 100644
--- a/apps/dav/lib/Connector/Sabre/ObjectTree.php
+++ b/apps/dav/lib/Connector/Sabre/ObjectTree.php
@@ -189,8 +189,8 @@ class ObjectTree extends CachingTree {
* This method must work recursively and delete the destination
* if it exists
*
- * @param string $source
- * @param string $destination
+ * @param string $sourcePath
+ * @param string $destinationPath
* @throws FileLocked
* @throws Forbidden
* @throws InvalidPath
@@ -201,14 +201,14 @@ class ObjectTree extends CachingTree {
* @throws \Sabre\DAV\Exception\ServiceUnavailable
* @return void
*/
- public function copy($source, $destination) {
+ public function copy($sourcePath, $destinationPath) {
if (!$this->fileView) {
throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
}
- $info = $this->fileView->getFileInfo(dirname($destination));
- if ($this->fileView->file_exists($destination)) {
+ $info = $this->fileView->getFileInfo(dirname($destinationPath));
+ if ($this->fileView->file_exists($destinationPath)) {
$destinationPermission = $info && $info->isUpdateable();
} else {
$destinationPermission = $info && $info->isCreatable();
@@ -218,9 +218,9 @@ class ObjectTree extends CachingTree {
}
// this will trigger existence check
- $this->getNodeForPath($source);
+ $this->getNodeForPath($sourcePath);
- list($destinationDir, $destinationName) = \Sabre\Uri\split($destination);
+ list($destinationDir, $destinationName) = \Sabre\Uri\split($destinationPath);
try {
$this->fileView->verifyPath($destinationDir, $destinationName);
} catch (\OCP\Files\InvalidPathException $ex) {
@@ -228,7 +228,7 @@ class ObjectTree extends CachingTree {
}
try {
- $this->fileView->copy($source, $destination);
+ $this->fileView->copy($sourcePath, $destinationPath);
} catch (StorageNotAvailableException $e) {
throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
} catch (ForbiddenException $ex) {
@@ -237,7 +237,7 @@ class ObjectTree extends CachingTree {
throw new FileLocked($e->getMessage(), $e->getCode(), $e);
}
- list($destinationDir,) = \Sabre\Uri\split($destination);
+ list($destinationDir,) = \Sabre\Uri\split($destinationPath);
$this->markDirty($destinationDir);
}
}