cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix email handling: remove encode()

Browse source
This commit is contained in:
Helmut Merz 2025-02-11 15:59:56 +01:00
parent c3efe7a6f9
commit bbc277e81d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
loops/organize/browser/member.py
View file

@ -260,16 +260,16 @@ class SecureMemberRegistration(BaseMemberRegistration, CreateForm):
name = '.'.join((self.text_names_prefix, self.email_key)) name = '.'.join((self.text_names_prefix, self.email_key))
text = self.resourceManager.get(name) text = self.resourceManager.get(name)
if text: if text:
message = (text.data % url).encode('UTF-8') message = (text.data % url)
subject = text.description or subject subject = text.description or subject
else: else:
message = _(u'confirmation_mail_text') + u':\n\n' message = _(u'confirmation_mail_text') + u':\n\n'
message = (message + url).encode('UTF-8') message = (message + url)
senderInfo = self.globalOptions('email.sender') senderInfo = self.globalOptions('email.sender')
sender = senderInfo and senderInfo[0] or 'info@loops.cy55.de' sender = senderInfo and senderInfo[0] or 'info@loops.cy55.de'
sender = sender.encode('UTF-8') #sender = sender.encode('UTF-8')
msg = MIMEText(message, 'plain', 'utf-8') msg = MIMEText(message, 'plain', 'utf-8')
msg['Subject'] = subject.encode('UTF-8') msg['Subject'] = subject
msg['From'] = sender msg['From'] = sender
msg['To'] = ', '.join(recipients) msg['To'] = ', '.join(recipients)
mailhost = component.getUtility(IMailDelivery, 'Mail') mailhost = component.getUtility(IMailDelivery, 'Mail')
@ -469,12 +469,12 @@ class PasswordReset(PasswordChange):
recipients = [recipient] recipients = [recipient]
subject = _(u'password_reset_mail_subject') subject = _(u'password_reset_mail_subject')
message = _(u'password_reset_mail_text') + u':\n\n' message = _(u'password_reset_mail_text') + u':\n\n'
message = (message + url).encode('UTF-8') message = (message + url)
senderInfo = self.globalOptions('email.sender') senderInfo = self.globalOptions('email.sender')
sender = senderInfo and senderInfo[0] or 'info@loops.cy55.de' sender = senderInfo and senderInfo[0] or 'info@loops.cy55.de'
sender = sender.encode('UTF-8') sender = sender
msg = MIMEText(message, 'plain', 'utf-8') msg = MIMEText(message, 'plain', 'utf-8')
msg['Subject'] = subject.encode('UTF-8') msg['Subject'] = subject
msg['From'] = sender msg['From'] = sender
msg['To'] = ', '.join(recipients) msg['To'] = ', '.join(recipients)
mailhost = component.getUtility(IMailDelivery, 'Mail') mailhost = component.getUtility(IMailDelivery, 'Mail')