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

remove unused variable and fix undefined variable

This commit is contained in:
Thomas Müller 2015-01-08 09:46:40 +01:00
parent 2e57fe93e4
commit 5f171618fd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
return $this->createFileChunked($data); return $this->createFileChunked($data);
} }
list($storage, $internalPath) = $this->fileView->resolvePath($this->path); list($storage, ) = $this->fileView->resolvePath($this->path);
$needsPartFile = $this->needsPartFile($storage); $needsPartFile = $this->needsPartFile($storage);
if ($needsPartFile) { if ($needsPartFile) {
@ -277,17 +277,17 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
} }
if ($chunk_handler->isComplete()) { if ($chunk_handler->isComplete()) {
list($storage, $internalPath) = $this->fileView->resolvePath($path); list($storage, ) = $this->fileView->resolvePath($path);
$needsPartFile = $this->needsPartFile($storage); $needsPartFile = $this->needsPartFile($storage);
try { try {
$targetPath = $path . '/' . $info['name'];
if ($needsPartFile) { if ($needsPartFile) {
// we first assembly the target file as a part file // we first assembly the target file as a part file
$partFile = $path . '/' . $info['name'] . '.ocTransferId' . $info['transferid'] . '.part'; $partFile = $path . '/' . $info['name'] . '.ocTransferId' . $info['transferid'] . '.part';
$chunk_handler->file_assemble($partFile); $chunk_handler->file_assemble($partFile);
// here is the final atomic rename // here is the final atomic rename
$targetPath = $path . '/' . $info['name'];
$renameOkay = $this->fileView->rename($partFile, $targetPath); $renameOkay = $this->fileView->rename($partFile, $targetPath);
$fileExists = $this->fileView->file_exists($targetPath); $fileExists = $this->fileView->file_exists($targetPath);
if ($renameOkay === false || $fileExists === false) { if ($renameOkay === false || $fileExists === false) {
@ -300,8 +300,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
} }
} else { } else {
// assemble directly into the final file // assemble directly into the final file
$partFile = $path . '/' . $info['name']; $chunk_handler->file_assemble($targetPath);
$chunk_handler->file_assemble($partFile);
} }
// allow sync clients to send the mtime along in a header // allow sync clients to send the mtime along in a header