From: Michael Tremer Date: Mon, 18 Nov 2019 11:25:44 +0000 (+0000) Subject: accounts: Drop exact search X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53d0ec1d60632ad78f378a3e53fe0de6a14fccc4;p=ipfire.org.git accounts: Drop exact search Signed-off-by: Michael Tremer --- diff --git a/src/backend/accounts.py b/src/backend/accounts.py index 5251ef33..c5982cac 100644 --- a/src/backend/accounts.py +++ b/src/backend/accounts.py @@ -107,16 +107,8 @@ class Accounts(Object): return self._search("(&(objectClass=person)(createTimestamp>=%s))" % t) def search(self, query): - # Search for exact matches - accounts = self._search( - "(&(objectClass=person)(|(uid=%s)(mail=%s)(displayName=%s)(sipAuthenticationUser=%s)(telephoneNumber=%s)(homePhone=%s)(mobile=%s)))" \ - % (query, query, query, query, query, query, query)) - - # Find accounts by name - if not accounts: - for account in self._search("(&(objectClass=person)(|(cn=*%s*)(uid=*%s*)(displayName=*%s*)))" % (query, query, query)): - if not account in accounts: - accounts.append(account) + accounts = self._search("(&(objectClass=person)(|(cn=*%s*)(uid=*%s*)(displayName=*%s*)(mail=*%s*)))" \ + % (query, query, query, query)) return sorted(accounts)