Skip to content

Commit e5b982a

Browse files
committed
fixup! feat: improve ZipFolderPlugin behaviour for different cases
Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com>
1 parent 16eaea2 commit e5b982a

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

apps/files_sharing/lib/Listener/BeforeZipCreatedListener.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,20 @@ public function handle(Event $event): void {
4848

4949
$user = $this->userSession->getUser();
5050
$folder = $event->getFolder();
51-
if ($user === null && $event->getFolder() === null) {
51+
if ($user === null && $folder === null) {
5252
// there is no way to know if the file is downloadable or not, allow it
5353
$event->setSuccessful(true);
5454
return;
5555
}
5656

5757
// in link-shares there may be no user, in that case we check that the share folder is downloadable
5858
$userFolder = $user ? $this->rootFolder->getUserFolder($user->getUID()) : null;
59-
$folderToCheck = $userFolder ? $userFolder->get($dir) : $folder;
59+
60+
$folderToCheck = $folder;
61+
if ($userFolder !== null) {
62+
// if we have a user, use their user folder
63+
$folderToCheck = $userFolder->getPath() === $dir ? $userFolder : $userFolder->get($dir);
64+
}
6065

6166
$viewOnlyHandler = new ViewOnly($folderToCheck);
6267
$isRootDownloadable = $viewOnlyHandler->isDownloadable($folderToCheck);

0 commit comments

Comments
 (0)