mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Filter out generic remote result for local users 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2018-10-17 21:21:39 +02:00
parent ce79e587e4
commit d7caf841df
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/Collaboration/Collaborators/RemotePlugin.php
View File

@ -115,7 +115,14 @@ class RemotePlugin implements ISearchPlugin {
$result['wide'] = array_slice($result['wide'], $offset, $limit); $result['wide'] = array_slice($result['wide'], $offset, $limit);
} }
/**
* Add generic share with remote item for valid cloud ids that are not users of the local instance
*/
if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) { if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
try {
list($remoteUser, $serverUrl) = $this->splitUserRemote($search);
$localUser = $this->userManager->get($remoteUser);
if ($localUser === null || $search !== $localUser->getCloudId()) {
$result['exact'][] = [ $result['exact'][] = [
'label' => $search, 'label' => $search,
'value' => [ 'value' => [
@ -124,6 +131,9 @@ class RemotePlugin implements ISearchPlugin {
], ],
]; ];
} }
} catch (\InvalidArgumentException $e) {
}
}
$searchResult->addResultSet($resultType, $result['wide'], $result['exact']); $searchResult->addResultSet($resultType, $result['wide'], $result['exact']);