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

active_bots/mailbot.py

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

sendmail.py

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