accounts: Remove any control characters

memcache does not like this and won't put things into its cache

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index 784ddabc2ea98b389637ce2ed0fb745907aa9a1a..9b15a1c83865db97b773c1d0a9121f23b4288d1c 100644 (file)
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -107,8 +107,8 @@ class Accounts(Object):
 
        def search(self, query):
                # Search for exact matches
-               accounts = self._search("(&(objectClass=person) \
-                       (|(uid=%s)(mail=%s)(sipAuthenticationUser=%s)(telephoneNumber=%s)(homePhone=%s)(mobile=%s)))" \
+               accounts = self._search(
+                       "(&(objectClass=person)(|(uid=%s)(mail=%s)(sipAuthenticationUser=%s)(telephoneNumber=%s)(homePhone=%s)(mobile=%s)))" \
                        % (query, query, query, query, query, query))
 
                # Find accounts by name
@@ -152,12 +152,19 @@ class Accounts(Object):
                return self.get_by_mail(s)
 
        def get_by_sip_id(self, sip_id):
-               return self._search_one("(|(&(objectClass=sipUser)(sipAuthenticationUser=%s)) \
-                       (&(objectClass=sipRoutingObject)(sipLocalAddress=%s)))" % (sip_id, sip_id))
+               if not sip_id:
+                       return
+
+               return self._search_one(
+                       "(|(&(objectClass=sipUser)(sipAuthenticationUser=%s))(&(objectClass=sipRoutingObject)(sipLocalAddress=%s)))" \
+                       % (sip_id, sip_id))
 
        def get_by_phone_number(self, number):
-               return self._search_one("(&(objectClass=inetOrgPerson) \
-                       (|(sipAuthenticationUser=%s)(telephoneNumber=%s)(homePhone=%s)(mobile=%s)))" \
+               if not number:
+                       return
+
+               return self._search_one(
+                       "(&(objectClass=inetOrgPerson)(|(sipAuthenticationUser=%s)(telephoneNumber=%s)(homePhone=%s)(mobile=%s)))" \
                        % (number, number, number, number))
 
        # Registration