From: Michael Tremer Date: Tue, 4 Dec 2018 00:27:35 +0000 (+0000) Subject: accounts: Use stored email address X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d86f6f18831d15fae47fee5d29c57c97b4a998cd;p=ipfire.org.git accounts: Use stored email address Signed-off-by: Michael Tremer --- diff --git a/src/backend/accounts.py b/src/backend/accounts.py index 95bc0064..67085376 100644 --- 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