nextcloud / server

lib/public/Collaboration/Collaborators/ISearchResult.php

Indentation +35 added lines, -35 removed lines

@@ -25,44 +25,44 @@
 
 
 interface ISearchResult {
-	/**
-	 * @param string $type one of: users, groups, remotes, email, circles, lookup
-	 * @param array $matches
-	 * @param array|null $exactMatches
-	 * @since 13.0.0
-	 */
-	public function addResultSet($type, array $matches, array $exactMatches = null);
+    /**
+     * @param string $type one of: users, groups, remotes, email, circles, lookup
+     * @param array $matches
+     * @param array|null $exactMatches
+     * @since 13.0.0
+     */
+    public function addResultSet($type, array $matches, array $exactMatches = null);
 
-	/**
-	 * @param string $type one of: users, groups, remotes, email, circles, lookup
-	 * @param string $collaboratorId
-	 * @return bool
-	 * @since 13.0.0
-	 */
-	public function hasResult($type, $collaboratorId);
+    /**
+     * @param string $type one of: users, groups, remotes, email, circles, lookup
+     * @param string $collaboratorId
+     * @return bool
+     * @since 13.0.0
+     */
+    public function hasResult($type, $collaboratorId);
 
-	/**
-	 * @param string $type one of: users, groups, remotes, email, circles, lookup
-	 * @since 13.0.0
-	 */
-	public function unsetResult($type);
+    /**
+     * @param string $type one of: users, groups, remotes, email, circles, lookup
+     * @since 13.0.0
+     */
+    public function unsetResult($type);
 
-	/**
-	 * @param string $type one of: users, groups, remotes, email, circles, lookup
-	 * @since 13.0.0
-	 */
-	public function markExactIdMatch($type);
+    /**
+     * @param string $type one of: users, groups, remotes, email, circles, lookup
+     * @since 13.0.0
+     */
+    public function markExactIdMatch($type);
 
-	/**
-	 * @param string $type one of: users, groups, remotes, email, circles, lookup
-	 * @return bool
-	 * @since 13.0.0
-	 */
-	public function hasExactIdMatch($type);
+    /**
+     * @param string $type one of: users, groups, remotes, email, circles, lookup
+     * @return bool
+     * @since 13.0.0
+     */
+    public function hasExactIdMatch($type);
 
-	/**
-	 * @return array
-	 * @since 13.0.0
-	 */
-	public function asArray();
+    /**
+     * @return array
+     * @since 13.0.0
+     */
+    public function asArray();
 }

lib/public/Collaboration/Collaborators/ISearchPlugin.php

Indentation +9 added lines, -9 removed lines

@@ -25,13 +25,13 @@
 
 
 interface ISearchPlugin {
-	/**
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @param ISearchResult $searchResult
-	 * @return bool whether the plugin has more results
-	 * @since 13.0.0
-	 */
-	public function search($search, $limit, $offset, ISearchResult $searchResult);
+    /**
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @param ISearchResult $searchResult
+     * @return bool whether the plugin has more results
+     * @since 13.0.0
+     */
+    public function search($search, $limit, $offset, ISearchResult $searchResult);
 }

lib/public/Collaboration/Collaborators/ISearch.php

Indentation +10 added lines, -10 removed lines

@@ -24,14 +24,14 @@
 namespace OCP\Collaboration\Collaborators;
 
 interface ISearch {
-	/**
-	 * @param string $search
-	 * @param array $shareTypes
-	 * @param bool $lookup
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array with two elements, 1st ISearchResult as array, 2nd a bool indicating whether more result are available
-	 * @since 13.0.0
-	 */
-	public function search($search, array $shareTypes, $lookup, $limit, $offset);
+    /**
+     * @param string $search
+     * @param array $shareTypes
+     * @param bool $lookup
+     * @param int $limit
+     * @param int $offset
+     * @return array with two elements, 1st ISearchResult as array, 2nd a bool indicating whether more result are available
+     * @since 13.0.0
+     */
+    public function search($search, array $shareTypes, $lookup, $limit, $offset);
 }

lib/private/Collaboration/Collaborators/SearchResult.php

Indentation +66 added lines, -66 removed lines

@@ -28,70 +28,70 @@
 
 class SearchResult implements ISearchResult {
 
-	protected $result = [
-		'exact' => [
-			'users' => [],
-			'groups' => [],
-			'remotes' => [],
-			'emails' => [],
-			'circles' => [],
-		],
-		'users' => [],
-		'groups' => [],
-		'remotes' => [],
-		'emails' => [],
-		'lookup' => [],
-		'circles' => [],
-	];
-
-	protected $exactIdMatches = [];
-
-	public function addResultSet($type, array $matches, array $exactMatches = null) {
-		if(!isset($this->result[$type])) {
-			throw new \InvalidArgumentException('Invalid type provided');
-		}
-
-		$this->result[$type] = array_merge($this->result[$type], $matches);
-		if(is_array($exactMatches)) {
-			$this->result['exact'][$type] = array_merge($this->result['exact'][$type], $exactMatches);
-		}
-	}
-
-	public function markExactIdMatch($type) {
-		$this->exactIdMatches[$type] = 1;
-	}
-
-	public function hasExactIdMatch($type) {
-		return isset($this->exactIdMatches[$type]);
-	}
-
-	public function hasResult($type, $collaboratorId) {
-		if(!isset($this->result[$type])) {
-			throw new \InvalidArgumentException('Invalid type provided');
-		}
-
-		$resultArrays = [$this->result['exact'][$type], $this->result[$type]];
-		foreach($resultArrays as $resultArray) {
-			if ($resultArray['value']['shareWith'] === $collaboratorId) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	public function asArray() {
-		return $this->result;
-	}
-
-	public function unsetResult($type) {
-		if(!isset($this->result[$type])) {
-			throw new \InvalidArgumentException('Invalid type provided');
-		}
-
-		$this->result[$type] = [];
-		if(isset($this->$result['exact'][$type])) {
-			$this->result['exact'][$type] = [];
-		}
-	}
+    protected $result = [
+        'exact' => [
+            'users' => [],
+            'groups' => [],
+            'remotes' => [],
+            'emails' => [],
+            'circles' => [],
+        ],
+        'users' => [],
+        'groups' => [],
+        'remotes' => [],
+        'emails' => [],
+        'lookup' => [],
+        'circles' => [],
+    ];
+
+    protected $exactIdMatches = [];
+
+    public function addResultSet($type, array $matches, array $exactMatches = null) {
+        if(!isset($this->result[$type])) {
+            throw new \InvalidArgumentException('Invalid type provided');
+        }
+
+        $this->result[$type] = array_merge($this->result[$type], $matches);
+        if(is_array($exactMatches)) {
+            $this->result['exact'][$type] = array_merge($this->result['exact'][$type], $exactMatches);
+        }
+    }
+
+    public function markExactIdMatch($type) {
+        $this->exactIdMatches[$type] = 1;
+    }
+
+    public function hasExactIdMatch($type) {
+        return isset($this->exactIdMatches[$type]);
+    }
+
+    public function hasResult($type, $collaboratorId) {
+        if(!isset($this->result[$type])) {
+            throw new \InvalidArgumentException('Invalid type provided');
+        }
+
+        $resultArrays = [$this->result['exact'][$type], $this->result[$type]];
+        foreach($resultArrays as $resultArray) {
+            if ($resultArray['value']['shareWith'] === $collaboratorId) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function asArray() {
+        return $this->result;
+    }
+
+    public function unsetResult($type) {
+        if(!isset($this->result[$type])) {
+            throw new \InvalidArgumentException('Invalid type provided');
+        }
+
+        $this->result[$type] = [];
+        if(isset($this->$result['exact'][$type])) {
+            $this->result['exact'][$type] = [];
+        }
+    }
 }

lib/private/Collaboration/Collaborators/CirclePlugin.php

Indentation +14 added lines, -14 removed lines

@@ -29,21 +29,21 @@
 use OCP\Collaboration\Collaborators\ISearchResult;
 
 class CirclePlugin implements ISearchPlugin {
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$result = ['wide' => [], 'exact' => []];
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $result = ['wide' => [], 'exact' => []];
 
-		if(\OC_App::isEnabled('circles')) {
-			$circles = Sharees::search($search);
-			if (array_key_exists('circles', $circles['exact'])) {
-				$result['exact'] = $circles['exact']['circles'];
-			}
-			if (array_key_exists('circles', $circles)) {
-				$result['wide'] = $circles['circles'];
-			}
+        if(\OC_App::isEnabled('circles')) {
+            $circles = Sharees::search($search);
+            if (array_key_exists('circles', $circles['exact'])) {
+                $result['exact'] = $circles['exact']['circles'];
+            }
+            if (array_key_exists('circles', $circles)) {
+                $result['wide'] = $circles['circles'];
+            }
 
-			$searchResult->addResultSet('circles', $result['wide'], $result['exact']);
-		}
+            $searchResult->addResultSet('circles', $result['wide'], $result['exact']);
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

lib/private/Collaboration/Collaborators/RemotePlugin.php

Indentation +89 added lines, -89 removed lines

@@ -32,104 +32,104 @@
 use OCP\Share;
 
 class RemotePlugin implements ISearchPlugin {
-	protected $shareeEnumeration;
+    protected $shareeEnumeration;
 
-	/** @var IManager */
-	private $contactsManager;
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-	/** @var IConfig */
-	private $config;
+    /** @var IManager */
+    private $contactsManager;
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config) {
-		$this->contactsManager = $contactsManager;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->config = $config;
+    public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config) {
+        $this->contactsManager = $contactsManager;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->config = $config;
 
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-	}
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$result = ['wide' => [], 'exact' => []];
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $result = ['wide' => [], 'exact' => []];
 
-		// Search in contacts
-		//@todo Pagination missing
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (!is_array($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					try {
-						list(, $serverUrl) = $this->splitUserRemote($cloudId);
-					} catch (\InvalidArgumentException $e) {
-						continue;
-					}
+        // Search in contacts
+        //@todo Pagination missing
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (!is_array($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    try {
+                        list(, $serverUrl) = $this->splitUserRemote($cloudId);
+                    } catch (\InvalidArgumentException $e) {
+                        continue;
+                    }
 
-					if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
-						if (strtolower($cloudId) === $lowerSearch) {
-							$searchResult->hasExactIdMatch('remotes');
-						}
-						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					} else {
-						$result['wide'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					}
-				}
-			}
-		}
+                    if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
+                        if (strtolower($cloudId) === $lowerSearch) {
+                            $searchResult->hasExactIdMatch('remotes');
+                        }
+                        $result['exact'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    } else {
+                        $result['wide'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
 
-		if (!$this->shareeEnumeration) {
-			$result['wide'] = [];
-		}
+        if (!$this->shareeEnumeration) {
+            $result['wide'] = [];
+        }
 
-		if (!$searchResult->hasExactIdMatch('remotes') && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
-			$result['exact'][] = [
-				'label' => $search,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_REMOTE,
-					'shareWith' => $search,
-				],
-			];
-		}
+        if (!$searchResult->hasExactIdMatch('remotes') && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
+            $result['exact'][] = [
+                'label' => $search,
+                'value' => [
+                    'shareType' => Share::SHARE_TYPE_REMOTE,
+                    'shareWith' => $search,
+                ],
+            ];
+        }
 
-		$searchResult->addResultSet('remotes', $result['wide'], $result['exact']);
+        $searchResult->addResultSet('remotes', $result['wide'], $result['exact']);
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \InvalidArgumentException
-	 */
-	public function splitUserRemote($address) {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \InvalidArgumentException
+     */
+    public function splitUserRemote($address) {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
 }

lib/private/Collaboration/Collaborators/UserPlugin.php

Indentation +109 added lines, -109 removed lines

@@ -34,114 +34,114 @@
 use OCP\Share;
 
 class UserPlugin implements ISearchPlugin {
-	/* @var bool */
-	protected $shareWithGroupOnly;
-	protected $shareeEnumeration;
-
-	/** @var IConfig */
-	private $config;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IUserManager */
-	private $userManager;
-
-	public function __construct(IConfig $config, IUserManager $userManager, IGroupManager $groupManager, IUserSession $userSession) {
-		$this->config = $config;
+    /* @var bool */
+    protected $shareWithGroupOnly;
+    protected $shareeEnumeration;
+
+    /** @var IConfig */
+    private $config;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IUserManager */
+    private $userManager;
+
+    public function __construct(IConfig $config, IUserManager $userManager, IGroupManager $groupManager, IUserSession $userSession) {
+        $this->config = $config;
 		
-		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-	}
-
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$result = ['wide' => [], 'exact' => []];
-		$users = [];
-		$hasMoreResults = false;
-
-		$userGroups = [];
-		if ($this->shareWithGroupOnly) {
-			// Search in all the groups this user is part of
-			$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-			foreach ($userGroups as $userGroup) {
-				$usersTmp = $this->groupManager->displayNamesInGroup($userGroup, $search, $limit, $offset);
-				foreach ($usersTmp as $uid => $userDisplayName) {
-					$users[$uid] = $userDisplayName;
-				}
-			}
-		} else {
-			// Search in all users
-			$usersTmp = $this->userManager->searchDisplayName($search, $limit, $offset);
-
-			foreach ($usersTmp as $user) {
-				$users[$user->getUID()] = $user->getDisplayName();
-			}
-		}
-
-		if (!$this->shareeEnumeration || sizeof($users) < $limit) {
-			$hasMoreResults = true;
-		}
-
-		$foundUserById = false;
-		$lowerSearch = strtolower($search);
-		foreach ($users as $uid => $userDisplayName) {
-			if (strtolower($uid) === $lowerSearch || strtolower($userDisplayName) === $lowerSearch) {
-				if (strtolower($uid) === $lowerSearch) {
-					$foundUserById = true;
-				}
-				$result['exact'][] = [
-					'label' => $userDisplayName,
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_USER,
-						'shareWith' => $uid,
-					],
-				];
-			} else {
-				$result['wide'][] = [
-					'label' => $userDisplayName,
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_USER,
-						'shareWith' => $uid,
-					],
-				];
-			}
-		}
-
-		if ($offset === 0 && !$foundUserById) {
-			// On page one we try if the search result has a direct hit on the
-			// user id and if so, we add that to the exact match list
-			$user = $this->userManager->get($search);
-			if ($user instanceof IUser) {
-				$addUser = true;
-
-				if ($this->shareWithGroupOnly) {
-					// Only add, if we have a common group
-					$commonGroups = array_intersect($userGroups, $this->groupManager->getUserGroupIds($user));
-					$addUser = !empty($commonGroups);
-				}
-
-				if ($addUser) {
-					array_push($result['exact'], [
-						'label' => $user->getDisplayName(),
-						'value' => [
-							'shareType' => Share::SHARE_TYPE_USER,
-							'shareWith' => $user->getUID(),
-						],
-					]);
-				}
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$result['wide'] = [];
-		}
-
-		$searchResult->addResultSet('users', $result['wide'], $result['exact']);
-
-		return $hasMoreResults;
-	}
+        $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+    }
+
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $result = ['wide' => [], 'exact' => []];
+        $users = [];
+        $hasMoreResults = false;
+
+        $userGroups = [];
+        if ($this->shareWithGroupOnly) {
+            // Search in all the groups this user is part of
+            $userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+            foreach ($userGroups as $userGroup) {
+                $usersTmp = $this->groupManager->displayNamesInGroup($userGroup, $search, $limit, $offset);
+                foreach ($usersTmp as $uid => $userDisplayName) {
+                    $users[$uid] = $userDisplayName;
+                }
+            }
+        } else {
+            // Search in all users
+            $usersTmp = $this->userManager->searchDisplayName($search, $limit, $offset);
+
+            foreach ($usersTmp as $user) {
+                $users[$user->getUID()] = $user->getDisplayName();
+            }
+        }
+
+        if (!$this->shareeEnumeration || sizeof($users) < $limit) {
+            $hasMoreResults = true;
+        }
+
+        $foundUserById = false;
+        $lowerSearch = strtolower($search);
+        foreach ($users as $uid => $userDisplayName) {
+            if (strtolower($uid) === $lowerSearch || strtolower($userDisplayName) === $lowerSearch) {
+                if (strtolower($uid) === $lowerSearch) {
+                    $foundUserById = true;
+                }
+                $result['exact'][] = [
+                    'label' => $userDisplayName,
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_USER,
+                        'shareWith' => $uid,
+                    ],
+                ];
+            } else {
+                $result['wide'][] = [
+                    'label' => $userDisplayName,
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_USER,
+                        'shareWith' => $uid,
+                    ],
+                ];
+            }
+        }
+
+        if ($offset === 0 && !$foundUserById) {
+            // On page one we try if the search result has a direct hit on the
+            // user id and if so, we add that to the exact match list
+            $user = $this->userManager->get($search);
+            if ($user instanceof IUser) {
+                $addUser = true;
+
+                if ($this->shareWithGroupOnly) {
+                    // Only add, if we have a common group
+                    $commonGroups = array_intersect($userGroups, $this->groupManager->getUserGroupIds($user));
+                    $addUser = !empty($commonGroups);
+                }
+
+                if ($addUser) {
+                    array_push($result['exact'], [
+                        'label' => $user->getDisplayName(),
+                        'value' => [
+                            'shareType' => Share::SHARE_TYPE_USER,
+                            'shareWith' => $user->getUID(),
+                        ],
+                    ]);
+                }
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $result['wide'] = [];
+        }
+
+        $searchResult->addResultSet('users', $result['wide'], $result['exact']);
+
+        return $hasMoreResults;
+    }
 }

lib/private/Collaboration/Collaborators/GroupPlugin.php

Indentation +75 added lines, -75 removed lines

@@ -32,91 +32,91 @@
 use OCP\Share;
 
 class GroupPlugin implements ISearchPlugin {
-	protected $shareeEnumeration;
-	protected $shareWithGroupOnly;
+    protected $shareeEnumeration;
+    protected $shareWithGroupOnly;
 
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(IConfig $config, IGroupManager $groupManager, IUserSession $userSession) {
-		$this->groupManager = $groupManager;
-		$this->config = $config;
-		$this->userSession = $userSession;
+    public function __construct(IConfig $config, IGroupManager $groupManager, IUserSession $userSession) {
+        $this->groupManager = $groupManager;
+        $this->config = $config;
+        $this->userSession = $userSession;
 
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-	}
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+        $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$hasMoreResults = false;
-		$result = ['wide' => [], 'exact' => []];
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $hasMoreResults = false;
+        $result = ['wide' => [], 'exact' => []];
 
-		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groupIds = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
+        $groups = $this->groupManager->search($search, $limit, $offset);
+        $groupIds = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
 
-		if (!$this->shareeEnumeration || sizeof($groups) < $limit) {
-			$hasMoreResults = true;
-		}
+        if (!$this->shareeEnumeration || sizeof($groups) < $limit) {
+            $hasMoreResults = true;
+        }
 
-		$userGroups =  [];
-		if (!empty($groups) && $this->shareWithGroupOnly) {
-			// Intersect all the groups that match with the groups this user is a member of
-			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			$userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
-			$groupIds = array_intersect($groupIds, $userGroups);
-		}
+        $userGroups =  [];
+        if (!empty($groups) && $this->shareWithGroupOnly) {
+            // Intersect all the groups that match with the groups this user is a member of
+            $userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
+            $userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
+            $groupIds = array_intersect($groupIds, $userGroups);
+        }
 
-		$lowerSearch = strtolower($search);
-		foreach ($groups as $group) {
-			// FIXME: use a more efficient approach
-			$gid = $group->getGID();
-			if (!in_array($gid, $groupIds)) {
-				continue;
-			}
-			if (strtolower($gid) === $lowerSearch || strtolower($group->getDisplayName()) === $lowerSearch) {
-				$result['exact'][] = [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_GROUP,
-						'shareWith' => $gid,
-					],
-				];
-			} else {
-				$result['wide'][] = [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_GROUP,
-						'shareWith' => $gid,
-					],
-				];
-			}
-		}
+        $lowerSearch = strtolower($search);
+        foreach ($groups as $group) {
+            // FIXME: use a more efficient approach
+            $gid = $group->getGID();
+            if (!in_array($gid, $groupIds)) {
+                continue;
+            }
+            if (strtolower($gid) === $lowerSearch || strtolower($group->getDisplayName()) === $lowerSearch) {
+                $result['exact'][] = [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_GROUP,
+                        'shareWith' => $gid,
+                    ],
+                ];
+            } else {
+                $result['wide'][] = [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_GROUP,
+                        'shareWith' => $gid,
+                    ],
+                ];
+            }
+        }
 
-		if ($offset === 0 && empty($result['exact'])) {
-			// On page one we try if the search result has a direct hit on the
-			// user id and if so, we add that to the exact match list
-			$group = $this->groupManager->get($search);
-			if ($group instanceof IGroup && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
-				array_push($result['exact'], [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_GROUP,
-						'shareWith' => $group->getGID(),
-					],
-				]);
-			}
-		}
+        if ($offset === 0 && empty($result['exact'])) {
+            // On page one we try if the search result has a direct hit on the
+            // user id and if so, we add that to the exact match list
+            $group = $this->groupManager->get($search);
+            if ($group instanceof IGroup && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
+                array_push($result['exact'], [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_GROUP,
+                        'shareWith' => $group->getGID(),
+                    ],
+                ]);
+            }
+        }
 
-		if (!$this->shareeEnumeration) {
-			$result['wide'] = [];
-		}
+        if (!$this->shareeEnumeration) {
+            $result['wide'] = [];
+        }
 
-		$searchResult->addResultSet('groups', $result['wide'], $result['exact']);
+        $searchResult->addResultSet('groups', $result['wide'], $result['exact']);
 
-		return [$result, $hasMoreResults];
-	}
+        return [$result, $hasMoreResults];
+    }
 }

lib/private/Collaboration/Collaborators/LookupPlugin.php

Indentation +40 added lines, -40 removed lines

@@ -32,52 +32,52 @@
 
 class LookupPlugin implements ISearchPlugin {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IClientService */
-	private $clientService;
+    /** @var IConfig */
+    private $config;
+    /** @var IClientService */
+    private $clientService;
 
-	public function __construct(IConfig $config, IClientService $clientService) {
-		$this->config = $config;
-		$this->clientService = $clientService;
-	}
+    public function __construct(IConfig $config, IClientService $clientService) {
+        $this->config = $config;
+        $this->clientService = $clientService;
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		if ($this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') !== 'yes') {
-			return false;
-		}
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        if ($this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') !== 'yes') {
+            return false;
+        }
 
-		$lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		$lookupServerUrl = rtrim($lookupServerUrl, '/');
-		$result = ['wide' => [], 'exact' => []];
+        $lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        $lookupServerUrl = rtrim($lookupServerUrl, '/');
+        $result = ['wide' => [], 'exact' => []];
 
-		try {
-			$client = $this->clientService->newClient();
-			$response = $client->get(
-				$lookupServerUrl . '/users?search=' . urlencode($search),
-				[
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
+        try {
+            $client = $this->clientService->newClient();
+            $response = $client->get(
+                $lookupServerUrl . '/users?search=' . urlencode($search),
+                [
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
 
-			$body = json_decode($response->getBody(), true);
+            $body = json_decode($response->getBody(), true);
 
-			$result = [];
-			foreach ($body as $lookup) {
-				$result[] = [
-					'label' => $lookup['federationId'],
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_REMOTE,
-						'shareWith' => $lookup['federationId'],
-					],
-					'extra' => $lookup,
-				];
-			}
-		} catch (\Exception $e) {
-		}
+            $result = [];
+            foreach ($body as $lookup) {
+                $result[] = [
+                    'label' => $lookup['federationId'],
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_REMOTE,
+                        'shareWith' => $lookup['federationId'],
+                    ],
+                    'extra' => $lookup,
+                ];
+            }
+        } catch (\Exception $e) {
+        }
 
-		$searchResult->addResultSet('lookup', $result, []);
+        $searchResult->addResultSet('lookup', $result, []);
 
-	}
+    }
 }