BulkUploadPlugin: Fix POST for regular file at previous symlink location

taminob · taminob · commit 99287da5788e · 2023-12-11T21:42:18.000+01:00
Signed-off-by: Tamino Bauknecht &lt;dev@tb6.eu&gt;
diff --git a/apps/dav/lib/BulkUpload/BulkUploadPlugin.php b/apps/dav/lib/BulkUpload/BulkUploadPlugin.php
@@ -111,6 +111,10 @@ public function httpPost(RequestInterface $request, ResponseInterface $response)
 
 				if (isset($headers['oc-file-type']) && $headers['oc-file-type'] == 1) {
 					$this->symlinkManager->storeSymlink($node);
+				} elseif ($this->symlinkManager->isSymlink($node)) {
+					// uploaded file is not a symlink, but there was a symlink
+					// at the same location before
+					$this->symlinkManager->deleteSymlink($node);
 				}
 
 				$writtenFiles[$headers['x-file-path']] = [

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,10 @@ public function httpPost(RequestInterface $request, ResponseInterface $response)`
`111`	`111`
`112`	`112`	`if (isset($headers['oc-file-type']) && $headers['oc-file-type'] == 1) {`
`113`	`113`	`$this->symlinkManager->storeSymlink($node);`
	`114`	`+ } elseif ($this->symlinkManager->isSymlink($node)) {`
	`115`	`+ // uploaded file is not a symlink, but there was a symlink`
	`116`	`+ // at the same location before`
	`117`	`+ $this->symlinkManager->deleteSymlink($node);`
`114`	`118`	`}`
`115`	`119`
`116`	`120`	`$writtenFiles[$headers['x-file-path']] = [`