nextcloud / server

lib/private/Contacts/ContactsMenu/ContactsStore.php

Indentation +234 added lines, -234 removed lines

@@ -40,238 +40,238 @@
 
 class ContactsStore implements IContactsStore {
 
-	/** @var IManager */
-	private $contactsManager;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/**
-	 * @param IManager $contactsManager
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IManager $contactsManager,
-								IConfig $config,
-								IUserManager $userManager,
-								IGroupManager $groupManager) {
-		$this->contactsManager = $contactsManager;
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param string|null $filter
-	 * @return IEntry[]
-	 */
-	public function getContacts(IUser $user, $filter, ?int $limit = null, ?int $offset = null) {
-		$options = [];
-		if ($limit !== null) {
-			$options['limit'] = $limit;
-		}
-		if ($offset !== null) {
-			$options['offset'] = $offset;
-		}
-
-		$allContacts = $this->contactsManager->search(
-			$filter ?: '',
-			[
-				'FN',
-				'EMAIL'
-			],
-			$options
-		);
-
-		$entries = array_map(function (array $contact) {
-			return $this->contactArrayToEntry($contact);
-		}, $allContacts);
-		return $this->filterContacts(
-			$user,
-			$entries,
-			$filter
-		);
-	}
-
-	/**
-	 * Filters the contacts. Applies 3 filters:
-	 *  1. filter the current user
-	 *  2. if the `shareapi_allow_share_dialog_user_enumeration` config option is
-	 * enabled it will filter all local users
-	 *  3. if the `shareapi_exclude_groups` config option is enabled and the
-	 * current user is in an excluded group it will filter all local users.
-	 *  4. if the `shareapi_only_share_with_group_members` config option is
-	 * enabled it will filter all users which doens't have a common group
-	 * with the current user.
-	 *
-	 * @param IUser $self
-	 * @param Entry[] $entries
-	 * @param string $filter
-	 * @return Entry[] the filtered contacts
-	 */
-	private function filterContacts(IUser $self,
-									array $entries,
-									$filter) {
-		$disallowEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') !== 'yes';
-		$restrictEnumeration = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-		$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes';
-
-		// whether to filter out local users
-		$skipLocal = false;
-		// whether to filter out all users which doesn't have the same group as the current user
-		$ownGroupsOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes' || $restrictEnumeration;
-
-		$selfGroups = $this->groupManager->getUserGroupIds($self);
-
-		if ($excludedGroups) {
-			$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
-			$decodedExcludeGroups = json_decode($excludedGroups, true);
-			$excludeGroupsList = ($decodedExcludeGroups !== null) ? $decodedExcludeGroups : [];
-
-			if (count(array_intersect($excludeGroupsList, $selfGroups)) !== 0) {
-				// a group of the current user is excluded -> filter all local users
-				$skipLocal = true;
-			}
-		}
-
-		$selfUID = $self->getUID();
-
-		return array_values(array_filter($entries, function (IEntry $entry) use ($self, $skipLocal, $ownGroupsOnly, $selfGroups, $selfUID, $disallowEnumeration, $filter) {
-			if ($skipLocal && $entry->getProperty('isLocalSystemBook') === true) {
-				return false;
-			}
-
-			// Prevent enumerating local users
-			if ($disallowEnumeration && $entry->getProperty('isLocalSystemBook')) {
-				$filterUser = true;
-
-				$mailAddresses = $entry->getEMailAddresses();
-				foreach ($mailAddresses as $mailAddress) {
-					if ($mailAddress === $filter) {
-						$filterUser = false;
-						break;
-					}
-				}
-
-				if ($entry->getProperty('UID') && $entry->getProperty('UID') === $filter) {
-					$filterUser = false;
-				}
-
-				if ($filterUser) {
-					return false;
-				}
-			}
-
-			if ($ownGroupsOnly && $entry->getProperty('isLocalSystemBook') === true) {
-				$uid = $this->userManager->get($entry->getProperty('UID'));
-
-				if ($uid === null) {
-					return false;
-				}
-
-				$contactGroups = $this->groupManager->getUserGroupIds($uid);
-				if (count(array_intersect($contactGroups, $selfGroups)) === 0) {
-					// no groups in common, so shouldn't see the contact
-					return false;
-				}
-			}
-
-			return $entry->getProperty('UID') !== $selfUID;
-		}));
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param integer $shareType
-	 * @param string $shareWith
-	 * @return IEntry|null
-	 */
-	public function findOne(IUser $user, $shareType, $shareWith) {
-		switch ($shareType) {
-			case 0:
-			case 6:
-				$filter = ['UID'];
-				break;
-			case 4:
-				$filter = ['EMAIL'];
-				break;
-			default:
-				return null;
-		}
-
-		$userId = $user->getUID();
-		$allContacts = $this->contactsManager->search($shareWith, $filter);
-		$contacts = array_filter($allContacts, function ($contact) use ($userId) {
-			return $contact['UID'] !== $userId;
-		});
-		$match = null;
-
-		foreach ($contacts as $contact) {
-			if ($shareType === 4 && isset($contact['EMAIL'])) {
-				if (in_array($shareWith, $contact['EMAIL'])) {
-					$match = $contact;
-					break;
-				}
-			}
-			if ($shareType === 0 || $shareType === 6) {
-				$isLocal = $contact['isLocalSystemBook'] ?? false;
-				if ($contact['UID'] === $shareWith && $isLocal === true) {
-					$match = $contact;
-					break;
-				}
-			}
-		}
-
-		if ($match) {
-			$match = $this->filterContacts($user, [$this->contactArrayToEntry($match)], $shareWith);
-			if (count($match) === 1) {
-				$match = $match[0];
-			} else {
-				$match = null;
-			}
-		}
-
-		return $match;
-	}
-
-	/**
-	 * @param array $contact
-	 * @return Entry
-	 */
-	private function contactArrayToEntry(array $contact) {
-		$entry = new Entry();
-
-		if (isset($contact['id'])) {
-			$entry->setId($contact['id']);
-		}
-
-		if (isset($contact['FN'])) {
-			$entry->setFullName($contact['FN']);
-		}
-
-		$avatarPrefix = "VALUE=uri:";
-		if (isset($contact['PHOTO']) && strpos($contact['PHOTO'], $avatarPrefix) === 0) {
-			$entry->setAvatar(substr($contact['PHOTO'], strlen($avatarPrefix)));
-		}
-
-		if (isset($contact['EMAIL'])) {
-			foreach ($contact['EMAIL'] as $email) {
-				$entry->addEMailAddress($email);
-			}
-		}
-
-		// Attach all other properties to the entry too because some
-		// providers might make use of it.
-		$entry->setProperties($contact);
-
-		return $entry;
-	}
+    /** @var IManager */
+    private $contactsManager;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /**
+     * @param IManager $contactsManager
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IManager $contactsManager,
+                                IConfig $config,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager) {
+        $this->contactsManager = $contactsManager;
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * @param IUser $user
+     * @param string|null $filter
+     * @return IEntry[]
+     */
+    public function getContacts(IUser $user, $filter, ?int $limit = null, ?int $offset = null) {
+        $options = [];
+        if ($limit !== null) {
+            $options['limit'] = $limit;
+        }
+        if ($offset !== null) {
+            $options['offset'] = $offset;
+        }
+
+        $allContacts = $this->contactsManager->search(
+            $filter ?: '',
+            [
+                'FN',
+                'EMAIL'
+            ],
+            $options
+        );
+
+        $entries = array_map(function (array $contact) {
+            return $this->contactArrayToEntry($contact);
+        }, $allContacts);
+        return $this->filterContacts(
+            $user,
+            $entries,
+            $filter
+        );
+    }
+
+    /**
+     * Filters the contacts. Applies 3 filters:
+     *  1. filter the current user
+     *  2. if the `shareapi_allow_share_dialog_user_enumeration` config option is
+     * enabled it will filter all local users
+     *  3. if the `shareapi_exclude_groups` config option is enabled and the
+     * current user is in an excluded group it will filter all local users.
+     *  4. if the `shareapi_only_share_with_group_members` config option is
+     * enabled it will filter all users which doens't have a common group
+     * with the current user.
+     *
+     * @param IUser $self
+     * @param Entry[] $entries
+     * @param string $filter
+     * @return Entry[] the filtered contacts
+     */
+    private function filterContacts(IUser $self,
+                                    array $entries,
+                                    $filter) {
+        $disallowEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') !== 'yes';
+        $restrictEnumeration = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+        $excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes';
+
+        // whether to filter out local users
+        $skipLocal = false;
+        // whether to filter out all users which doesn't have the same group as the current user
+        $ownGroupsOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes' || $restrictEnumeration;
+
+        $selfGroups = $this->groupManager->getUserGroupIds($self);
+
+        if ($excludedGroups) {
+            $excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
+            $decodedExcludeGroups = json_decode($excludedGroups, true);
+            $excludeGroupsList = ($decodedExcludeGroups !== null) ? $decodedExcludeGroups : [];
+
+            if (count(array_intersect($excludeGroupsList, $selfGroups)) !== 0) {
+                // a group of the current user is excluded -> filter all local users
+                $skipLocal = true;
+            }
+        }
+
+        $selfUID = $self->getUID();
+
+        return array_values(array_filter($entries, function (IEntry $entry) use ($self, $skipLocal, $ownGroupsOnly, $selfGroups, $selfUID, $disallowEnumeration, $filter) {
+            if ($skipLocal && $entry->getProperty('isLocalSystemBook') === true) {
+                return false;
+            }
+
+            // Prevent enumerating local users
+            if ($disallowEnumeration && $entry->getProperty('isLocalSystemBook')) {
+                $filterUser = true;
+
+                $mailAddresses = $entry->getEMailAddresses();
+                foreach ($mailAddresses as $mailAddress) {
+                    if ($mailAddress === $filter) {
+                        $filterUser = false;
+                        break;
+                    }
+                }
+
+                if ($entry->getProperty('UID') && $entry->getProperty('UID') === $filter) {
+                    $filterUser = false;
+                }
+
+                if ($filterUser) {
+                    return false;
+                }
+            }
+
+            if ($ownGroupsOnly && $entry->getProperty('isLocalSystemBook') === true) {
+                $uid = $this->userManager->get($entry->getProperty('UID'));
+
+                if ($uid === null) {
+                    return false;
+                }
+
+                $contactGroups = $this->groupManager->getUserGroupIds($uid);
+                if (count(array_intersect($contactGroups, $selfGroups)) === 0) {
+                    // no groups in common, so shouldn't see the contact
+                    return false;
+                }
+            }
+
+            return $entry->getProperty('UID') !== $selfUID;
+        }));
+    }
+
+    /**
+     * @param IUser $user
+     * @param integer $shareType
+     * @param string $shareWith
+     * @return IEntry|null
+     */
+    public function findOne(IUser $user, $shareType, $shareWith) {
+        switch ($shareType) {
+            case 0:
+            case 6:
+                $filter = ['UID'];
+                break;
+            case 4:
+                $filter = ['EMAIL'];
+                break;
+            default:
+                return null;
+        }
+
+        $userId = $user->getUID();
+        $allContacts = $this->contactsManager->search($shareWith, $filter);
+        $contacts = array_filter($allContacts, function ($contact) use ($userId) {
+            return $contact['UID'] !== $userId;
+        });
+        $match = null;
+
+        foreach ($contacts as $contact) {
+            if ($shareType === 4 && isset($contact['EMAIL'])) {
+                if (in_array($shareWith, $contact['EMAIL'])) {
+                    $match = $contact;
+                    break;
+                }
+            }
+            if ($shareType === 0 || $shareType === 6) {
+                $isLocal = $contact['isLocalSystemBook'] ?? false;
+                if ($contact['UID'] === $shareWith && $isLocal === true) {
+                    $match = $contact;
+                    break;
+                }
+            }
+        }
+
+        if ($match) {
+            $match = $this->filterContacts($user, [$this->contactArrayToEntry($match)], $shareWith);
+            if (count($match) === 1) {
+                $match = $match[0];
+            } else {
+                $match = null;
+            }
+        }
+
+        return $match;
+    }
+
+    /**
+     * @param array $contact
+     * @return Entry
+     */
+    private function contactArrayToEntry(array $contact) {
+        $entry = new Entry();
+
+        if (isset($contact['id'])) {
+            $entry->setId($contact['id']);
+        }
+
+        if (isset($contact['FN'])) {
+            $entry->setFullName($contact['FN']);
+        }
+
+        $avatarPrefix = "VALUE=uri:";
+        if (isset($contact['PHOTO']) && strpos($contact['PHOTO'], $avatarPrefix) === 0) {
+            $entry->setAvatar(substr($contact['PHOTO'], strlen($avatarPrefix)));
+        }
+
+        if (isset($contact['EMAIL'])) {
+            foreach ($contact['EMAIL'] as $email) {
+                $entry->addEMailAddress($email);
+            }
+        }
+
+        // Attach all other properties to the entry too because some
+        // providers might make use of it.
+        $entry->setProperties($contact);
+
+        return $entry;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
 			$options
 		);
 
-		$entries = array_map(function (array $contact) {
+		$entries = array_map(function(array $contact) {
 			return $this->contactArrayToEntry($contact);
 		}, $allContacts);
 		return $this->filterContacts(
@@ -144,7 +144,7 @@ 
 
 		$selfUID = $self->getUID();
 
-		return array_values(array_filter($entries, function (IEntry $entry) use ($self, $skipLocal, $ownGroupsOnly, $selfGroups, $selfUID, $disallowEnumeration, $filter) {
+		return array_values(array_filter($entries, function(IEntry $entry) use ($self, $skipLocal, $ownGroupsOnly, $selfGroups, $selfUID, $disallowEnumeration, $filter) {
 			if ($skipLocal && $entry->getProperty('isLocalSystemBook') === true) {
 				return false;
 			}
@@ -209,7 +209,7 @@ 
 
 		$userId = $user->getUID();
 		$allContacts = $this->contactsManager->search($shareWith, $filter);
-		$contacts = array_filter($allContacts, function ($contact) use ($userId) {
+		$contacts = array_filter($allContacts, function($contact) use ($userId) {
 			return $contact['UID'] !== $userId;
 		});
 		$match = null;

lib/private/Contacts/ContactsMenu/Manager.php

Indentation +75 added lines, -75 removed lines

@@ -32,90 +32,90 @@
 
 class Manager {
 
-	/** @var ContactsStore */
-	private $store;
+    /** @var ContactsStore */
+    private $store;
 
-	/** @var ActionProviderStore */
-	private $actionProviderStore;
+    /** @var ActionProviderStore */
+    private $actionProviderStore;
 
-	/** @var IAppManager */
-	private $appManager;
+    /** @var IAppManager */
+    private $appManager;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param ContactsStore $store
-	 * @param ActionProviderStore $actionProviderStore
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(ContactsStore $store, ActionProviderStore $actionProviderStore, IAppManager $appManager, IConfig $config) {
-		$this->store = $store;
-		$this->actionProviderStore = $actionProviderStore;
-		$this->appManager = $appManager;
-		$this->config = $config;
-	}
+    /**
+     * @param ContactsStore $store
+     * @param ActionProviderStore $actionProviderStore
+     * @param IAppManager $appManager
+     */
+    public function __construct(ContactsStore $store, ActionProviderStore $actionProviderStore, IAppManager $appManager, IConfig $config) {
+        $this->store = $store;
+        $this->actionProviderStore = $actionProviderStore;
+        $this->appManager = $appManager;
+        $this->config = $config;
+    }
 
-	/**
-	 * @param IUser $user
-	 * @param string $filter
-	 * @return array
-	 */
-	public function getEntries(IUser $user, $filter) {
-		$maxAutocompleteResults = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', 25);
-		$minSearchStringLength = $this->config->getSystemValueInt('sharing.minSearchStringLength', 0);
-		$topEntries = [];
-		if (strlen($filter) >= $minSearchStringLength) {
-			$entries = $this->store->getContacts($user, $filter, $maxAutocompleteResults);
+    /**
+     * @param IUser $user
+     * @param string $filter
+     * @return array
+     */
+    public function getEntries(IUser $user, $filter) {
+        $maxAutocompleteResults = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', 25);
+        $minSearchStringLength = $this->config->getSystemValueInt('sharing.minSearchStringLength', 0);
+        $topEntries = [];
+        if (strlen($filter) >= $minSearchStringLength) {
+            $entries = $this->store->getContacts($user, $filter, $maxAutocompleteResults);
 
-			$sortedEntries = $this->sortEntries($entries);
-			$topEntries = array_slice($sortedEntries, 0, $maxAutocompleteResults);
-			$this->processEntries($topEntries, $user);
-		}
+            $sortedEntries = $this->sortEntries($entries);
+            $topEntries = array_slice($sortedEntries, 0, $maxAutocompleteResults);
+            $this->processEntries($topEntries, $user);
+        }
 
-		$contactsEnabled = $this->appManager->isEnabledForUser('contacts', $user);
-		return [
-			'contacts' => $topEntries,
-			'contactsAppEnabled' => $contactsEnabled,
-		];
-	}
+        $contactsEnabled = $this->appManager->isEnabledForUser('contacts', $user);
+        return [
+            'contacts' => $topEntries,
+            'contactsAppEnabled' => $contactsEnabled,
+        ];
+    }
 
-	/**
-	 * @param IUser $user
-	 * @param integer $shareType
-	 * @param string $shareWith
-	 * @return IEntry
-	 */
-	public function findOne(IUser $user, $shareType, $shareWith) {
-		$entry = $this->store->findOne($user, $shareType, $shareWith);
-		if ($entry) {
-			$this->processEntries([$entry], $user);
-		}
+    /**
+     * @param IUser $user
+     * @param integer $shareType
+     * @param string $shareWith
+     * @return IEntry
+     */
+    public function findOne(IUser $user, $shareType, $shareWith) {
+        $entry = $this->store->findOne($user, $shareType, $shareWith);
+        if ($entry) {
+            $this->processEntries([$entry], $user);
+        }
 
-		return $entry;
-	}
+        return $entry;
+    }
 
-	/**
-	 * @param IEntry[] $entries
-	 * @return IEntry[]
-	 */
-	private function sortEntries(array $entries) {
-		usort($entries, function (IEntry $entryA, IEntry $entryB) {
-			return strcasecmp($entryA->getFullName(), $entryB->getFullName());
-		});
-		return $entries;
-	}
+    /**
+     * @param IEntry[] $entries
+     * @return IEntry[]
+     */
+    private function sortEntries(array $entries) {
+        usort($entries, function (IEntry $entryA, IEntry $entryB) {
+            return strcasecmp($entryA->getFullName(), $entryB->getFullName());
+        });
+        return $entries;
+    }
 
-	/**
-	 * @param IEntry[] $entries
-	 * @param IUser $user
-	 */
-	private function processEntries(array $entries, IUser $user) {
-		$providers = $this->actionProviderStore->getProviders($user);
-		foreach ($entries as $entry) {
-			foreach ($providers as $provider) {
-				$provider->process($entry);
-			}
-		}
-	}
+    /**
+     * @param IEntry[] $entries
+     * @param IUser $user
+     */
+    private function processEntries(array $entries, IUser $user) {
+        $providers = $this->actionProviderStore->getProviders($user);
+        foreach ($entries as $entry) {
+            foreach ($providers as $provider) {
+                $provider->process($entry);
+            }
+        }
+    }
 }

lib/public/Contacts/ContactsMenu/IContactsStore.php

Indentation +18 added lines, -18 removed lines

@@ -31,23 +31,23 @@
 interface IContactsStore {
 
 
-	/**
-	 * @param IUser $user
-	 * @param string $filter
-	 * @param int $limit added 19.0.2
-	 * @param int $offset added 19.0.2
-	 * @return IEntry[]
-	 * @since 13.0.0
-	 */
-	public function getContacts(IUser $user, $filter, ?int $limit = null, ?int $offset = null);
+    /**
+     * @param IUser $user
+     * @param string $filter
+     * @param int $limit added 19.0.2
+     * @param int $offset added 19.0.2
+     * @return IEntry[]
+     * @since 13.0.0
+     */
+    public function getContacts(IUser $user, $filter, ?int $limit = null, ?int $offset = null);
 
-	/**
-	 * @brief finds a contact by specifying the property to search on ($shareType) and the value ($shareWith)
-	 * @param IUser $user
-	 * @param integer $shareType
-	 * @param string $shareWith
-	 * @return IEntry|null
-	 * @since 13.0.0
-	 */
-	public function findOne(IUser $user, $shareType, $shareWith);
+    /**
+     * @brief finds a contact by specifying the property to search on ($shareType) and the value ($shareWith)
+     * @param IUser $user
+     * @param integer $shareType
+     * @param string $shareWith
+     * @return IEntry|null
+     * @since 13.0.0
+     */
+    public function findOne(IUser $user, $shareType, $shareWith);
 }