throw new \Sabre_DAV_Exception_Forbidden();
}
- if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
- $info = OC_FileChunking::decodeName($name);
- if (empty($info)) {
- throw new Sabre_DAV_Exception_NotImplemented();
- }
- $chunk_handler = new OC_FileChunking($info);
- $chunk_handler->store($info['index'], $data);
- if ($chunk_handler->isComplete()) {
- $newPath = $this->path . '/' . $info['name'];
- $chunk_handler->file_assemble($newPath);
- return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
- }
- } else {
- $newPath = $this->path . '/' . $name;
-
- // mark file as partial while uploading (ignored by the scanner)
- $partpath = $newPath . '.part';
-
- \OC\Files\Filesystem::file_put_contents($partpath, $data);
-
- //detect aborted upload
- if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT' ) {
- if (isset($_SERVER['CONTENT_LENGTH'])) {
- $expected = $_SERVER['CONTENT_LENGTH'];
- $actual = \OC\Files\Filesystem::filesize($partpath);
- if ($actual != $expected) {
- \OC\Files\Filesystem::unlink($partpath);
- throw new Sabre_DAV_Exception_BadRequest(
- 'expected filesize ' . $expected . ' got ' . $actual);
- }
- }
- }
-
- // rename to correct path
- $renameOkay = \OC\Files\Filesystem::rename($partpath, $newPath);
- $fileExists = \OC\Files\Filesystem::file_exists($newPath);
- if ($renameOkay === false || $fileExists === false) {
- \OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
- \OC\Files\Filesystem::unlink($partpath);
- throw new Sabre_DAV_Exception();
- }
-
- // allow sync clients to send the mtime along in a header
- $mtime = OC_Request::hasModificationTime();
- if ($mtime !== false) {
- if(\OC\Files\Filesystem::touch($newPath, $mtime)) {
- header('X-OC-MTime: accepted');
- }
- }
-
- return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
- }
-
- return null;
+ $path = $this->path . '/' . $name;
+ $node = new OC_Connector_Sabre_File($path);
+ return $node->put($data);
++
++// if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
++// $info = OC_FileChunking::decodeName($name);
++// if (empty($info)) {
++// throw new Sabre_DAV_Exception_NotImplemented();
++// }
++// $chunk_handler = new OC_FileChunking($info);
++// $chunk_handler->store($info['index'], $data);
++// if ($chunk_handler->isComplete()) {
++// $newPath = $this->path . '/' . $info['name'];
++// $chunk_handler->file_assemble($newPath);
++// return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
++// }
++// } else {
++// $newPath = $this->path . '/' . $name;
++//
++// // mark file as partial while uploading (ignored by the scanner)
++// $partpath = $newPath . '.part';
++//
++// \OC\Files\Filesystem::file_put_contents($partpath, $data);
++//
++// //detect aborted upload
++// if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT' ) {
++// if (isset($_SERVER['CONTENT_LENGTH'])) {
++// $expected = $_SERVER['CONTENT_LENGTH'];
++// $actual = \OC\Files\Filesystem::filesize($partpath);
++// if ($actual != $expected) {
++// \OC\Files\Filesystem::unlink($partpath);
++// throw new Sabre_DAV_Exception_BadRequest(
++// 'expected filesize ' . $expected . ' got ' . $actual);
++// }
++// }
++// }
++//
++// // rename to correct path
++// $renameOkay = \OC\Files\Filesystem::rename($partpath, $newPath);
++// $fileExists = \OC\Files\Filesystem::file_exists($newPath);
++// if ($renameOkay === false || $fileExists === false) {
++// \OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
++// \OC\Files\Filesystem::unlink($partpath);
++// throw new Sabre_DAV_Exception();
++// }
++//
++// // allow sync clients to send the mtime along in a header
++// $mtime = OC_Request::hasModificationTime();
++// if ($mtime !== false) {
++// if(\OC\Files\Filesystem::touch($newPath, $mtime)) {
++// header('X-OC-MTime: accepted');
++// }
++// }
++//
++// return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
++// }
++//
++// return null;
++//>>>>>>> master
}
/**
*
* The data argument is a readable stream resource.
*
-- * After a succesful put operation, you may choose to return an ETag. The
++ * After a successful put operation, you may choose to return an ETag. The
* etag must always be surrounded by double-quotes. These quotes must
* appear in the actual string you're returning.
*
}
// rename to correct path
- $fs->rename($partpath, $this->path);
- $renameOkay = \OC\Files\Filesystem::rename($partpath, $this->path);
- $fileExists = \OC\Files\Filesystem::file_exists($this->path);
++ $renameOkay = $fs->rename($partpath, $this->path);
++ $fileExists = $fs->file_exists($this->path);
+ if ($renameOkay === false || $fileExists === false) {
+ \OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
- \OC\Files\Filesystem::unlink($partpath);
++ $fs->unlink($partpath);
+ throw new Sabre_DAV_Exception();
+ }
-
- //allow sync clients to send the mtime along in a header
+ // allow sync clients to send the mtime along in a header
$mtime = OC_Request::hasModificationTime();
if ($mtime !== false) {
- if (\OC\Files\Filesystem::touch($this->path, $mtime)) {
+ if($fs->touch($this->path, $mtime)) {
header('X-OC-MTime: accepted');
}
}