From d117d5c98c7775e051be607327bfa6ea882a3401 Mon Sep 17 00:00:00 2001 From: Goffi Date: Sun, 26 May 2019 22:20:33 +0200 Subject: [PATCH] tools (email): moved email code to common so it can be used by frontends --- sat/tools/{ => common}/email.py | 37 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 19 deletions(-) rename sat/tools/{ => common}/email.py (64%) diff --git a/sat/tools/email.py b/sat/tools/common/email.py similarity index 64% rename from sat/tools/email.py rename to sat/tools/common/email.py index ef4e647d..d70eed7f 100644 --- a/sat/tools/email.py +++ b/sat/tools/common/email.py @@ -20,17 +20,16 @@ """email sending facilities""" from __future__ import absolute_import -from sat.core.constants import Const as C -from sat.core.log import getLogger - -log = getLogger(__name__) -from twisted.mail import smtp from email.mime.text import MIMEText +from twisted.mail import smtp +from sat.core.constants import Const as C +from sat.tools import config as tools_config -def sendEmail(host, to_emails, subject=u"", body=u"", from_email=None): - """send an email using SàT configuration +def sendEmail(config, to_emails, subject=u"", body=u"", from_email=None): + """Send an email using SàT configuration + @param config (SafeConfigParser): the configuration instance @param to_emails(list[unicode], unicode): list of recipients if unicode, it will be split to get emails @param subject(unicode): subject of the message @@ -40,18 +39,19 @@ def sendEmail(host, to_emails, subject=u"", body=u"", from_email=None): """ if isinstance(to_emails, basestring): to_emails = to_emails.split() - email_host = host.memory.getConfig(None, u"email_server") or u"localhost" - email_from = host.memory.getConfig(None, u"email_from") + email_host = tools_config.getConfig(config, None, u"email_server") or u"localhost" + email_from = tools_config.getConfig(config, None, u"email_from") if email_from is None: # we suppose that email domain and XMPP domain are identical - domain = host.memory.getConfig(None, u"xmpp_domain", u"example.net") + domain = tools_config.getConfig(config, None, u"xmpp_domain", u"example.net") email_from = u"no_reply@" + domain - email_sender_domain = host.memory.getConfig(None, u"email_sender_domain") - email_port = int(host.memory.getConfig(None, u"email_port", 25)) - email_username = host.memory.getConfig(None, u"email_username") - email_password = host.memory.getConfig(None, u"email_password") - email_auth = C.bool(host.memory.getConfig(None, "email_auth", C.BOOL_FALSE)) - email_starttls = C.bool(host.memory.getConfig(None, "email_starttls", C.BOOL_FALSE)) + email_sender_domain = tools_config.getConfig(config, None, u"email_sender_domain") + email_port = int(tools_config.getConfig(config, None, u"email_port", 25)) + email_username = tools_config.getConfig(config, None, u"email_username") + email_password = tools_config.getConfig(config, None, u"email_password") + email_auth = C.bool(tools_config.getConfig(config, None, "email_auth", C.BOOL_FALSE)) + email_starttls = C.bool(tools_config.getConfig(config, None, "email_starttls", + C.BOOL_FALSE)) msg = MIMEText(body, "plain", "UTF-8") msg[u"Subject"] = subject @@ -63,9 +63,8 @@ def sendEmail(host, to_emails, subject=u"", body=u"", from_email=None): email_from.encode("utf-8"), [email.encode("utf-8") for email in to_emails], msg.as_string(), - senderDomainName=email_sender_domain.encode("utf-8") - if email_sender_domain - else None, + senderDomainName=email_sender_domain.encode("utf-8") if email_sender_domain + else None, port=email_port, username=email_username.encode("utf-8") if email_username else None, password=email_password.encode("utf-8") if email_password else None,