]> source.dussan.org Git - nextcloud-server.git/commitdiff
If a existing file in Shared/ with update permissions gets updated we need to write...
authorBjoern Schiessle <schiessle@owncloud.com>
Tue, 8 Oct 2013 09:26:49 +0000 (11:26 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Tue, 8 Oct 2013 09:26:49 +0000 (11:26 +0200)
lib/private/connector/sabre/file.php

index 12d7585884ede391cd75e63e2f13ba8d7ecbefee..43e25de40c7d6b682e2316e249e9b39845f51262 100644 (file)
@@ -45,7 +45,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
         * @return string|null
         */
        public function put($data) {
+
                $fs = $this->getFS();
+
                if ($fs->file_exists($this->path) &&
                        !$fs->isUpdatable($this->path)) {
                        throw new \Sabre_DAV_Exception_Forbidden();
@@ -58,12 +60,14 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 
                // chunked handling
                if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+
                        list($path, $name) = \Sabre_DAV_URLUtil::splitPath($this->path);
 
                        $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()) {
@@ -78,6 +82,13 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
                // mark file as partial while uploading (ignored by the scanner)
                $partpath = $this->path . '.part';
 
+               // if file is located in /Shared we write the part file to the users
+               // root folder because we can't create new files in /shared
+               // we extend the name with a random number to avoid overwriting a existing file
+               if (dirname($partpath) === 'Shared') {
+                       $partpath = pathinfo($partpath, PATHINFO_FILENAME) . rand();
+               }
+
                try {
                        $putOkay = $fs->file_put_contents($partpath, $data);
                        if ($putOkay === false) {