open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: also filter by storage when getting shares in folder

Browse Source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
pull/42638/head
Robin Appelman 2 years ago
parent c651e06a6d
commit bfeb97c54a
3 changed files with 12 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      apps/federatedfilesharing/lib/FederatedShareProvider.php
  2. 1
      apps/sharebymail/lib/ShareByMailProvider.php
  3. 11
      lib/private/Share20/DefaultShareProvider.php

3
apps/federatedfilesharing/lib/FederatedShareProvider.php
Unescape View File

@ -605,8 +605,9 @@ class FederatedShareProvider implements IShareProvider {
$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
$qb->andWhere($qb->expr()->eq('f.storage', $qb->createNamedParameter($node->getMountPoint()->getNumericStorageId(), IQueryBuilder::PARAM_INT)));
if ($shallow) {
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId(), IQueryBuilder::PARAM_INT)));
} else {
$qb->andWhere($qb->expr()->like('f.path', $qb->createNamedParameter($this->dbConnection->escapeLikeParameter($node->getInternalPath()) . '/%')));
}

1
apps/sharebymail/lib/ShareByMailProvider.php
Unescape View File

@ -1069,6 +1069,7 @@ class ShareByMailProvider implements IShareProvider {
$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
$qb->andWhere($qb->expr()->eq('f.storage', $qb->createNamedParameter($node->getMountPoint()->getNumericStorageId(), IQueryBuilder::PARAM_INT)));
if ($shallow) {
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
} else {

11
lib/private/Share20/DefaultShareProvider.php
Unescape View File

@ -692,17 +692,24 @@ class DefaultShareProvider implements IShareProvider {
}, $childMountNodes);
$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
$storageFilter = $qb->expr()->eq('f.storage', $qb->createNamedParameter($node->getMountPoint()->getNumericStorageId(), IQueryBuilder::PARAM_INT));
if ($shallow) {
$qb->andWhere(
$qb->expr()->orX(
$qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())),
$qb->expr()->andX(
$storageFilter,
$qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())),
),
$qb->expr()->in('f.fileid', $qb->createParameter('chunk'))
)
);
} else {
$qb->andWhere(
$qb->expr()->orX(
$qb->expr()->like('f.path', $qb->createNamedParameter($this->dbConn->escapeLikeParameter($node->getInternalPath()) . '/%')),
$qb->expr()->andX(
$storageFilter,
$qb->expr()->like('f.path', $qb->createNamedParameter($this->dbConn->escapeLikeParameter($node->getInternalPath()) . '/%')),
),
$qb->expr()->in('f.fileid', $qb->createParameter('chunk'))
)
);

Write Preview
Loading…
Cancel
Save