Remove useless setting.

modoboa · Apr 24, 2017 · 9cdd691 · 9cdd691
1 parent 61fe680
commit 9cdd691
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/modoboa_webmail/forms.py b/modoboa_webmail/forms.py
@@ -321,12 +321,6 @@ class UserSettings(param_forms.UserParametersForm):
         help_text=_("Enable/Disable HTML links display")
     )
 
-    display_full_addresses = form_utils.YesNoField(
-        initial=True,
-        label=_("Show full email addresses"),
-        help_text=_("Show full email addresses when displaying a message")
-    )
-
     messages_per_page = forms.IntegerField(
         initial=40,
         label=_("Number of displayed emails per page"),

diff --git a/modoboa_webmail/lib/imapemail.py b/modoboa_webmail/lib/imapemail.py
@@ -39,10 +39,9 @@ class ImapEmail(Email):
         ('Subject', True),
     ]
 
-    def __init__(self, request, addrfull, *args, **kwargs):
+    def __init__(self, request, *args, **kwargs):
         super(ImapEmail, self).__init__(*args, **kwargs)
         self.request = request
-        self.addrfull = addrfull
         self.imapc = get_imapconnector(request)
         self.mbox, self.mailid = self.mailid.split(":")
 
@@ -94,9 +93,7 @@ def get_header(self, msg, hdrname):
             return ""
         try:
             key = re.sub("-", "_", hdrname).lower()
-            hdrvalue = getattr(imapheader, "parse_%s" % key)(
-                hdrvalue, full=self.addrfull
-            )
+            hdrvalue = getattr(imapheader, "parse_%s" % key)(hdrvalue)
         except AttributeError:
             pass
         return hdrvalue

diff --git a/modoboa_webmail/views.py b/modoboa_webmail/views.py
@@ -513,7 +513,7 @@ def getmailcontent(request):
     if mbox is None or mailid is None:
         raise BadRequest(_("Invalid request"))
     email = ImapEmail(
-        request, request.user.parameters.get_value("display_full_addresses"),
+        request,
         "%s:%s" % (mbox, mailid), dformat="DISPLAYMODE",
         links=int(request.GET["links"])
     )
@@ -533,7 +533,7 @@ def viewmail(request):
     else:
         links = int(links)
     email = ImapEmail(
-        request, request.user.parameters.get_value("display_full_addresses"),
+        request,
         "%s:%s" % (mbox, mailid), dformat="DISPLAYMODE", links=links
     )
     email.fetch_headers()