From 70f4e7e10a87a912ccaf82693beb58ebe1e265a5 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Wed, 27 Nov 2019 09:21:17 +0100 Subject: [PATCH] Catch file transfer error and stop transfer ownership command Signed-off-by: Christoph Wurst --- apps/files/lib/Service/OwnershipTransferService.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/files/lib/Service/OwnershipTransferService.php b/apps/files/lib/Service/OwnershipTransferService.php index 0c5c25237b..1683bbee9d 100644 --- a/apps/files/lib/Service/OwnershipTransferService.php +++ b/apps/files/lib/Service/OwnershipTransferService.php @@ -215,6 +215,9 @@ class OwnershipTransferService { return $shares; } + /** + * @throws TransferOwnershipException + */ protected function transferFiles(string $sourceUid, string $sourcePath, string $finalTarget, @@ -228,7 +231,9 @@ class OwnershipTransferService { $view->mkdir($finalTarget); $finalTarget = $finalTarget . '/' . basename($sourcePath); } - $view->rename($sourcePath, $finalTarget); + if ($view->rename($sourcePath, $finalTarget) === false) { + throw new TransferOwnershipException("Could not transfer files", 1); + } if (!is_dir("$sourceUid/files")) { // because the files folder is moved away we need to recreate it $view->mkdir("$sourceUid/files");