]> source.dussan.org Git - nextcloud-server.git/commitdiff
hide shared files located in group folder's trash bin 37493/head
authorArthur Schiwon <blizzz@arthur-schiwon.de>
Tue, 28 Mar 2023 11:48:43 +0000 (13:48 +0200)
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>
Thu, 30 Mar 2023 16:13:46 +0000 (16:13 +0000)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
lib/private/Share20/DefaultShareProvider.php

index 5ce444942f345c3fbc3c390f84b232e42021d853..ef1f1465ba39d868c311950f7560fc3e2885c85c 100644 (file)
@@ -55,6 +55,7 @@ use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IAttributes;
 use OCP\Share\IShare;
 use OCP\Share\IShareProvider;
+use function str_starts_with;
 
 /**
  * Class DefaultShareProvider
@@ -864,6 +865,11 @@ class DefaultShareProvider implements IShareProvider {
                if ($pathSections[0] !== 'files'
                        && (strpos($data['storage_string_id'], 'home::') === 0 || strpos($data['storage_string_id'], 'object::user') === 0)) {
                        return false;
+               } elseif ($pathSections[0] === '__groupfolders'
+                       && str_starts_with($pathSections[1], 'trash/')
+               ) {
+                       // exclude shares leading to trashbin on group folders storages
+                       return false;
                }
                return true;
        }