accounts: Use stored email address

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

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index 95bc0064820a38abf72ff038f638eb7173823d71..67085376ab4fbbbab35fe981c9d161c5413d3ac8 100644 (file)
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -193,7 +193,7 @@ class Accounts(Object):
                        WHERE session_id = %s AND host = %s", session_id, host)
 
                return self.get_by_uid(res.uid)
-               
+
 
 class Account(Object):
        def __init__(self, backend, dn, attrs=None):
@@ -502,21 +502,7 @@ class Account(Object):
 
        @property
        def email(self):
-               name = self.name.lower()
-               name = name.replace(" ", ".")
-               name = name.replace("Ä", "Ae")
-               name = name.replace("Ö", "Oe")
-               name = name.replace("Ü", "Ue")
-               name = name.replace("ä", "ae")
-               name = name.replace("ö", "oe")
-               name = name.replace("ü", "ue")
-
-               for mail in self.attributes.get("mail", []):
-                       if mail.decode().startswith("%s@ipfire.org" % name):
-                               return mail
-
-               # If everything else fails, we will go with the UID
-               return "%s@ipfire.org" % self.uid
+               return self._get_string("mail")
 
        # Mail Routing Address