mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-17 05:41:25 +02:00
Merge pull request #1111 from modoboa/fix/quote_local_part
Quote sender local-part.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
"""Core models."""
|
||||
|
||||
from email.header import Header
|
||||
import re
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
@@ -223,10 +224,9 @@ class User(PermissionsMixin):
|
||||
|
||||
@property
|
||||
def encoded_address(self):
|
||||
from email.header import Header
|
||||
if self.first_name != "" or self.last_name != "":
|
||||
return "%s <%s>" % \
|
||||
(Header(self.fullname, "utf8").encode(), self.email)
|
||||
return '"{}" <{}>'.format(
|
||||
Header(self.fullname, "utf8").encode(), self.email)
|
||||
return self.email
|
||||
|
||||
def is_owner(self, obj):
|
||||
|
||||
@@ -276,6 +276,8 @@ def prepare_addresses(addresses, usage="header"):
|
||||
"""
|
||||
result = []
|
||||
for address in re.split('[,;]', addresses):
|
||||
if not address:
|
||||
continue
|
||||
name, addr = parseaddr(address)
|
||||
if name and usage == "header":
|
||||
result.append("%s <%s>" % (Header(name, 'utf8').encode(), addr))
|
||||
|
||||
Reference in New Issue
Block a user