Clean up the logic of the contacts store a bit

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php
index e0e0bf832b330468a09ceaab66a07b574f2459af..69f26c7969fb854997322071ad86c2697c1d2ea0 100644 (file)
--- a/lib/private/Contacts/ContactsMenu/ContactsStore.php
+++ b/lib/private/Contacts/ContactsMenu/ContactsStore.php
@@ -165,21 +165,21 @@ class ContactsStore implements IContactsStore {
                                                return false;
                                        }
 
-                                       $filterUser = true;
+                                       $filterOutUser = true;
 
                                        $mailAddresses = $entry->getEMailAddresses();
                                        foreach ($mailAddresses as $mailAddress) {
                                                if ($mailAddress === $filter) {
-                                                       $filterUser = false;
+                                                       $filterOutUser = false;
                                                        break;
                                                }
                                        }
 
                                        if ($entry->getProperty('UID') && $entry->getProperty('UID') === $filter) {
-                                               $filterUser = false;
+                                               $filterOutUser = false;
                                        }
 
-                                       if ($filterUser) {
+                                       if ($filterOutUser) {
                                                return false;
                                        }
                                } elseif ($restrictEnumerationPhone || $restrictEnumerationGroup) {
@@ -208,7 +208,7 @@ class ContactsStore implements IContactsStore {
                                if ($ownGroupsOnly && !$checkedCommonGroupAlready) {
                                        $user = $this->userManager->get($entry->getProperty('UID'));
 
-                                       if ($user === null) {
+                                       if (!$user instanceof IUser) {
                                                return false;
                                        }