Revert "geoip: Tolerate lots of spaces in database fields"

[people/shoehn/ipfire.org.git] / webapp / backend / accounts.py

diff --git a/webapp/backend/accounts.py b/webapp/backend/accounts.py
index e52b1899f99ffcdf61199376758cb681486d2d41..242cbf387dd3f9e60566466cf57b357dd7e8f0b6 100644 (file)
--- a/webapp/backend/accounts.py
+++ b/webapp/backend/accounts.py
@@ -183,7 +183,8 @@ class Account(Object):
                return "admins" in self.groups
 
        def is_talk_enabled(self):
-               return "sipUser" in self.classes or "sipRoutingObject" in self.classes
+               return "sipUser" in self.classes or "sipRoutingObject" in self.classes \
+                       or self.telephone_numbers or self.address
 
        @property
        def classes(self):
@@ -278,7 +279,20 @@ class Account(Object):
 
        @property
        def telephone_numbers(self):
-               return self.attributes.get("telephoneNumber")
+               return self._telephone_numbers + self.mobile_telephone_numbers \
+                       + self.home_telephone_numbers
+
+       @property
+       def _telephone_numbers(self):
+               return self.attributes.get("telephoneNumber") or []
+
+       @property
+       def home_telephone_numbers(self):
+               return self.attributes.get("homePhone") or []
+
+       @property
+       def mobile_telephone_numbers(self):
+               return self.attributes.get("mobile") or []
 
        def avatar_url(self, size=None):
                if self.backend.debug: