nextcloud / server

lib/private/Collaboration/Collaborators/UserPlugin.php

Indentation +163 added lines, -163 removed lines

@@ -41,167 +41,167 @@
 use OCP\Share\IShare;
 
 class UserPlugin implements ISearchPlugin {
-	/* @var bool */
-	protected $shareWithGroupOnly;
-	protected $shareeEnumeration;
-	protected $shareeEnumerationInGroupOnly;
-
-	/** @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->groupManager = $groupManager;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-
-		$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->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-	}
-
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$result = ['wide' => [], 'exact' => []];
-		$users = [];
-		$autoCompleteUsers = [];
-		$hasMoreResults = false;
-
-		$userGroups = [];
-		if ($this->shareWithGroupOnly) {
-			// Search in all the groups this user is part of
-			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			foreach ($userGroups as $userGroup) {
-				$usersInGroup = $userGroup->searchDisplayName($search, $limit, $offset);
-				foreach ($usersInGroup as $user) {
-					$users[$user->getUID()] = $user;
-				}
-			}
-		} else {
-			// Search in all users
-			$usersTmp = $this->userManager->searchDisplayName($search, $limit, $offset);
-			$currentUserGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-			foreach ($usersTmp as $user) {
-				if ($user->isEnabled()) { // Don't keep deactivated users
-					$users[$user->getUID()] = $user;
-
-					$addToWideResults = false;
-					if ($this->shareeEnumeration && !$this->shareeEnumerationInGroupOnly) {
-						$addToWideResults = true;
-					}
-
-					if ($this->shareeEnumerationInGroupOnly) {
-						$commonGroups = array_intersect($currentUserGroups, $this->groupManager->getUserGroupIds($user));
-						if (!empty($commonGroups)) {
-							$addToWideResults = true;
-						}
-					}
-
-					if ($addToWideResults) {
-						$autoCompleteUsers[] = [
-							'label' => $user->getDisplayName(),
-							'value' => [
-								'shareType' => IShare::TYPE_USER,
-								'shareWith' => (string)$user->getUID(),
-							],
-						];
-					}
-				}
-			}
-		}
-
-		$this->takeOutCurrentUser($users);
-
-		if (!$this->shareeEnumeration || count($users) < $limit) {
-			$hasMoreResults = true;
-		}
-
-		$foundUserById = false;
-		$lowerSearch = strtolower($search);
-		foreach ($users as $uid => $user) {
-			$userDisplayName = $user->getDisplayName();
-			$userEmail = $user->getEMailAddress();
-			$uid = (string) $uid;
-			if (
-				strtolower($uid) === $lowerSearch ||
-				strtolower($userDisplayName) === $lowerSearch ||
-				strtolower($userEmail) === $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
-					$userGroupIds = array_map(function(IGroup $group) {
-						return $group->getGID();
-					}, $userGroups);
-					$commonGroups = array_intersect($userGroupIds, $this->groupManager->getUserGroupIds($user));
-					$addUser = !empty($commonGroups);
-				}
-
-				if ($addUser) {
-					$result['exact'][] = [
-						'label' => $user->getDisplayName(),
-						'value' => [
-							'shareType' => Share::SHARE_TYPE_USER,
-							'shareWith' => $user->getUID(),
-						],
-					];
-				}
-			}
-		}
-
-		// overwrite wide matches if they are limited
-		if (!$this->shareeEnumeration || $this->shareeEnumerationInGroupOnly) {
-			$result['wide'] = $autoCompleteUsers;
-		}
-
-		$type = new SearchResultType('users');
-		$searchResult->addResultSet($type, $result['wide'], $result['exact']);
-		if (count($result['exact'])) {
-			$searchResult->markExactIdMatch($type);
-		}
-
-		return $hasMoreResults;
-	}
-
-	public function takeOutCurrentUser(array &$users) {
-		$currentUser = $this->userSession->getUser();
-		if(!is_null($currentUser)) {
-			if (isset($users[$currentUser->getUID()])) {
-				unset($users[$currentUser->getUID()]);
-			}
-		}
-	}
+    /* @var bool */
+    protected $shareWithGroupOnly;
+    protected $shareeEnumeration;
+    protected $shareeEnumerationInGroupOnly;
+
+    /** @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->groupManager = $groupManager;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+
+        $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->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+    }
+
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $result = ['wide' => [], 'exact' => []];
+        $users = [];
+        $autoCompleteUsers = [];
+        $hasMoreResults = false;
+
+        $userGroups = [];
+        if ($this->shareWithGroupOnly) {
+            // Search in all the groups this user is part of
+            $userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
+            foreach ($userGroups as $userGroup) {
+                $usersInGroup = $userGroup->searchDisplayName($search, $limit, $offset);
+                foreach ($usersInGroup as $user) {
+                    $users[$user->getUID()] = $user;
+                }
+            }
+        } else {
+            // Search in all users
+            $usersTmp = $this->userManager->searchDisplayName($search, $limit, $offset);
+            $currentUserGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+            foreach ($usersTmp as $user) {
+                if ($user->isEnabled()) { // Don't keep deactivated users
+                    $users[$user->getUID()] = $user;
+
+                    $addToWideResults = false;
+                    if ($this->shareeEnumeration && !$this->shareeEnumerationInGroupOnly) {
+                        $addToWideResults = true;
+                    }
+
+                    if ($this->shareeEnumerationInGroupOnly) {
+                        $commonGroups = array_intersect($currentUserGroups, $this->groupManager->getUserGroupIds($user));
+                        if (!empty($commonGroups)) {
+                            $addToWideResults = true;
+                        }
+                    }
+
+                    if ($addToWideResults) {
+                        $autoCompleteUsers[] = [
+                            'label' => $user->getDisplayName(),
+                            'value' => [
+                                'shareType' => IShare::TYPE_USER,
+                                'shareWith' => (string)$user->getUID(),
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
+
+        $this->takeOutCurrentUser($users);
+
+        if (!$this->shareeEnumeration || count($users) < $limit) {
+            $hasMoreResults = true;
+        }
+
+        $foundUserById = false;
+        $lowerSearch = strtolower($search);
+        foreach ($users as $uid => $user) {
+            $userDisplayName = $user->getDisplayName();
+            $userEmail = $user->getEMailAddress();
+            $uid = (string) $uid;
+            if (
+                strtolower($uid) === $lowerSearch ||
+                strtolower($userDisplayName) === $lowerSearch ||
+                strtolower($userEmail) === $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
+                    $userGroupIds = array_map(function(IGroup $group) {
+                        return $group->getGID();
+                    }, $userGroups);
+                    $commonGroups = array_intersect($userGroupIds, $this->groupManager->getUserGroupIds($user));
+                    $addUser = !empty($commonGroups);
+                }
+
+                if ($addUser) {
+                    $result['exact'][] = [
+                        'label' => $user->getDisplayName(),
+                        'value' => [
+                            'shareType' => Share::SHARE_TYPE_USER,
+                            'shareWith' => $user->getUID(),
+                        ],
+                    ];
+                }
+            }
+        }
+
+        // overwrite wide matches if they are limited
+        if (!$this->shareeEnumeration || $this->shareeEnumerationInGroupOnly) {
+            $result['wide'] = $autoCompleteUsers;
+        }
+
+        $type = new SearchResultType('users');
+        $searchResult->addResultSet($type, $result['wide'], $result['exact']);
+        if (count($result['exact'])) {
+            $searchResult->markExactIdMatch($type);
+        }
+
+        return $hasMoreResults;
+    }
+
+    public function takeOutCurrentUser(array &$users) {
+        $currentUser = $this->userSession->getUser();
+        if(!is_null($currentUser)) {
+            if (isset($users[$currentUser->getUID()])) {
+                unset($users[$currentUser->getUID()]);
+            }
+        }
+    }
 }

lib/private/Collaboration/Collaborators/Search.php

Indentation +60 added lines, -60 removed lines

@@ -31,75 +31,75 @@
 use OCP\Share;
 
 class Search implements ISearch {
-	/** @var IContainer */
-	private $c;
+    /** @var IContainer */
+    private $c;
 
-	protected $pluginList = [];
+    protected $pluginList = [];
 
-	public function __construct(IContainer $c) {
-		$this->c = $c;
-	}
+    public function __construct(IContainer $c) {
+        $this->c = $c;
+    }
 
-	/**
-	 * @param string $search
-	 * @param array $shareTypes
-	 * @param bool $lookup
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function search($search, array $shareTypes, $lookup, $limit, $offset) {
-		$hasMoreResults = false;
+    /**
+     * @param string $search
+     * @param array $shareTypes
+     * @param bool $lookup
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return array
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function search($search, array $shareTypes, $lookup, $limit, $offset) {
+        $hasMoreResults = false;
 
-		/** @var ISearchResult $searchResult */
-		$searchResult = $this->c->resolve(SearchResult::class);
+        /** @var ISearchResult $searchResult */
+        $searchResult = $this->c->resolve(SearchResult::class);
 
-		foreach ($shareTypes as $type) {
-			if(!isset($this->pluginList[$type])) {
-				continue;
-			}
-			foreach ($this->pluginList[$type] as $plugin) {
-				/** @var ISearchPlugin $searchPlugin */
-				$searchPlugin = $this->c->resolve($plugin);
-				$hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
-			}
-		}
+        foreach ($shareTypes as $type) {
+            if(!isset($this->pluginList[$type])) {
+                continue;
+            }
+            foreach ($this->pluginList[$type] as $plugin) {
+                /** @var ISearchPlugin $searchPlugin */
+                $searchPlugin = $this->c->resolve($plugin);
+                $hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
+            }
+        }
 
-		// Get from lookup server, not a separate share type
-		if ($lookup) {
-			$searchPlugin = $this->c->resolve(LookupPlugin::class);
-			$hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
-		}
+        // Get from lookup server, not a separate share type
+        if ($lookup) {
+            $searchPlugin = $this->c->resolve(LookupPlugin::class);
+            $hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
+        }
 
-		// sanitizing, could go into the plugins as well
+        // sanitizing, could go into the plugins as well
 
-		// if we have a exact match, either for the federated cloud id or for the
-		// email address we only return the exact match. It is highly unlikely
-		// that the exact same email address and federated cloud id exists
-		$emailType = new SearchResultType('emails');
-		$remoteType = new SearchResultType('remotes');
-		if($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
-			$searchResult->unsetResult($remoteType);
-		} elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) {
-			$searchResult->unsetResult($emailType);
-		}
+        // if we have a exact match, either for the federated cloud id or for the
+        // email address we only return the exact match. It is highly unlikely
+        // that the exact same email address and federated cloud id exists
+        $emailType = new SearchResultType('emails');
+        $remoteType = new SearchResultType('remotes');
+        if($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
+            $searchResult->unsetResult($remoteType);
+        } elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) {
+            $searchResult->unsetResult($emailType);
+        }
 
-		// if we have an exact local user match, there is no need to show the remote and email matches
-		$userType = new SearchResultType('users');
-		if($searchResult->hasExactIdMatch($userType)) {
-			$searchResult->unsetResult($remoteType);
-			$searchResult->unsetResult($emailType);
-		}
+        // if we have an exact local user match, there is no need to show the remote and email matches
+        $userType = new SearchResultType('users');
+        if($searchResult->hasExactIdMatch($userType)) {
+            $searchResult->unsetResult($remoteType);
+            $searchResult->unsetResult($emailType);
+        }
 
-		return [$searchResult->asArray(), (bool)$hasMoreResults];
-	}
+        return [$searchResult->asArray(), (bool)$hasMoreResults];
+    }
 
-	public function registerPlugin(array $pluginInfo) {
-		$shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
-		if($shareType === null) {
-			throw new \InvalidArgumentException('Provided ShareType is invalid');
-		}
-		$this->pluginList[$shareType][] = $pluginInfo['class'];
-	}
+    public function registerPlugin(array $pluginInfo) {
+        $shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
+        if($shareType === null) {
+            throw new \InvalidArgumentException('Provided ShareType is invalid');
+        }
+        $this->pluginList[$shareType][] = $pluginInfo['class'];
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -56,7 +56,7 @@ 
 		$searchResult = $this->c->resolve(SearchResult::class);
 
 		foreach ($shareTypes as $type) {
-			if(!isset($this->pluginList[$type])) {
+			if (!isset($this->pluginList[$type])) {
 				continue;
 			}
 			foreach ($this->pluginList[$type] as $plugin) {
@@ -79,7 +79,7 @@ 
 		// that the exact same email address and federated cloud id exists
 		$emailType = new SearchResultType('emails');
 		$remoteType = new SearchResultType('remotes');
-		if($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
+		if ($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
 			$searchResult->unsetResult($remoteType);
 		} elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) {
 			$searchResult->unsetResult($emailType);
@@ -87,17 +87,17 @@ 
 
 		// if we have an exact local user match, there is no need to show the remote and email matches
 		$userType = new SearchResultType('users');
-		if($searchResult->hasExactIdMatch($userType)) {
+		if ($searchResult->hasExactIdMatch($userType)) {
 			$searchResult->unsetResult($remoteType);
 			$searchResult->unsetResult($emailType);
 		}
 
-		return [$searchResult->asArray(), (bool)$hasMoreResults];
+		return [$searchResult->asArray(), (bool) $hasMoreResults];
 	}
 
 	public function registerPlugin(array $pluginInfo) {
-		$shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
-		if($shareType === null) {
+		$shareType = constant(Share::class.'::'.$pluginInfo['shareType']);
+		if ($shareType === null) {
 			throw new \InvalidArgumentException('Provided ShareType is invalid');
 		}
 		$this->pluginList[$shareType][] = $pluginInfo['class'];