Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename

This commit is contained in:
Son NK 2020-04-05 12:59:36 +02:00
parent d1e5b9f9b7
commit a7eefe8232
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
email_handler.py
View File

@ -149,14 +149,14 @@ def replace_header_when_forward(msg: Message, alias: Alias, header: str):
need_replace = False
for addr in addrs:
name, email = parseaddr(addr)
name, contact_email = parseaddr(addr)
# no transformation when alias is already in the header
if email == alias.email:
if contact_email == alias.email:
new_addrs.append(addr)
continue
contact = Contact.get_by(alias_id=alias.id, website_email=email)
contact = Contact.get_by(alias_id=alias.id, website_email=contact_email)
if contact:
# update the website_from if needed
if contact.website_from != addr:
@ -167,7 +167,7 @@ def replace_header_when_forward(msg: Message, alias: Alias, header: str):
LOG.debug(
"create contact for alias %s and email %s, header %s",
alias,
email,
contact_email,
header,
)
@ -176,7 +176,7 @@ def replace_header_when_forward(msg: Message, alias: Alias, header: str):
contact = Contact.create(
user_id=alias.user_id,
alias_id=alias.id,
website_email=email,
website_email=contact_email,
website_from=addr,
reply_email=reply_email,
is_cc=header.lower() == "cc",