Skip to content

Emit moveToTrash event only for the deleting user #16664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 2 commits into from
Sep 6, 2019
Merged

Emit moveToTrash event only for the deleting user #16664

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1832c8
Emit moveToTrash event only for the deleting user
juliusknorr Aug 5, 2019
8e7c287
Use the owner from the storage
rullzer Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use the owner from the storage 
Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer
rullzer committed Aug 7, 2019
commit 8e7c287e2ac4bd60d69a77fb7295e8ea2b8b9617
12 changes: 9 additions & 3 deletions apps/files_trashbin/lib/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,19 @@ public function rmdir($path) {
protected function shouldMoveToTrash($path) {
$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
$parts = explode('/', $normalized);
if (count($parts) < 4 || !$this->userManager->userExists($parts[1])) {
if (count($parts) < 4) {
return false;
}

// check if there is a app which want to disable the trash bin for this file
$fileId = $this->storage->getCache()->getId($path);
$nodes = $this->rootFolder->getUserFolder($parts[1])->getById($fileId);
$owner = $this->storage->getOwner($path);
if ($owner === false) {
$nodes = $this->rootFolder->getById($fileId);
} else {
$nodes = $this->rootFolder->getUserFolder($owner)->getById($fileId);
}

foreach ($nodes as $node) {
$event = $this->createMoveToTrashEvent($node);
$this->eventDispatcher->dispatch('OCA\Files_Trashbin::moveToTrash', $event);
Expand All @@ -142,7 +148,7 @@ protected function shouldMoveToTrash($path) {
}
}

if ($parts[2] === 'files') {
if ($parts[2] === 'files' && $this->userManager->userExists($parts[1])) {
return true;
}

Expand Down