b3yond/ticketfrei
1
0
Fork 0
Code Issues 28 Pull requests Releases Wiki Activity

fixing #38: putting the city into the From address of report mails

Browse source
This commit is contained in:
b3yond 2018-10-06 02:46:54 +02:00
parent 304d83ffad
commit b9a4899981
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
active_bots/mailbot.py
View file

@ -36,8 +36,9 @@ class Mailbot(Bot):
+ db.mail_subscription_token(rec, user.get_city()) + db.mail_subscription_token(rec, user.get_city())
if report.author != rec: if report.author != rec:
try: try:
sendmail.sendmail(rec, "Ticketfrei " + user.get_city() + city = user.get_city()
" Report", body=body) sendmail.sendmail(rec, "Ticketfrei " + city + " Report",
city=city, body=body)
except Exception: except Exception:
logger.error("Sending Mail failed.", exc_info=True) logger.error("Sending Mail failed.", exc_info=True)

5
sendmail.py
View file

@ -71,8 +71,11 @@ class Mailer(object):
return "Sent mail to " + recipient + ": " + subject return "Sent mail to " + recipient + ": " + subject
def sendmail(to, subject, body=''): def sendmail(to, subject, city=None, body=''):
msg = MIMEMultipart() msg = MIMEMultipart()
if city:
msg['From'] = 'Ticketfrei <%s@%s>' % (city, getfqdn())
else:
msg['From'] = 'Ticketfrei <%s@%s>' % (getuser(), getfqdn()) msg['From'] = 'Ticketfrei <%s@%s>' % (getuser(), getfqdn())
msg['To'] = to msg['To'] = to
msg['Subject'] = '[Ticketfrei] %s' % (subject, ) msg['Subject'] = '[Ticketfrei] %s' % (subject, )