From 8ae2683d714dac4a2b614a53efd2607acca2401e Mon Sep 17 00:00:00 2001 From: Ulrich Knechtelsdorfer Date: Sun, 27 Nov 2016 22:46:13 +0100 Subject: [PATCH] - add email server login data to settings --- app/send_email.py | 10 ++++------ app/settings.py | 9 ++++++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/send_email.py b/app/send_email.py index e78252b..da04763 100644 --- a/app/send_email.py +++ b/app/send_email.py @@ -5,11 +5,12 @@ import database # from email.MIMEText import MIMEText import user import logging +from settings import * def send_email(recipient, subject, body): - gmail_user = 'bier1baroness' - gmail_pwd = 'test11test11' - FROM = 'bier1baroness@gmail.com' + gmail_user = settings.mailUsername + gmail_pwd = settings.mailPassword + FROM = settings.mailFromName SUBJECT = subject TEXT = body @@ -32,8 +33,6 @@ def send_email(recipient, subject, body): logging.error("Failed to send mail to %s" %recipient) def send_emails(body, subject, users): - FROM = 'bier1baroness@gmail.com' - for user in users: debt = database.get_debt(user.name) subject_parsed = parse_email(subject, user, debt) @@ -41,7 +40,6 @@ def send_emails(body, subject, users): send_email(user.email, subject_parsed, body_parsed) def parse_email(text, u, dept): - text = text.replace('%%longname%%', u.longname) text = text.replace('%%dept%%', str(dept)) diff --git a/app/settings.py b/app/settings.py index 97c9d43..dba7303 100644 --- a/app/settings.py +++ b/app/settings.py @@ -41,7 +41,14 @@ class Settings: self.autoAnnoy = False #Automatically send payment eMails self.annoyDays = 20 #Automatically send mails every x days (default 20) self.annoyLimit = 100 #Money limit for autoAnnoy (default 100) - #Mail Messages + + ##Email + #Login data and server + self.SMTPserver = "smtp.gmail.com:587" #Mailserver URL + self.mailUsername = "bier1baroness" #Username for the mailserver + self.mailPassword = "test11test11" #Password for the User on the mailserver + self.mailFromName = "bier1baroness@gmail.com" #From filed in mail header + #Standard Texts self.singleMessageStandardSubject = u"Baroness - Bierrechnung" self.singleMessageStandardText = u"Hallo %%longname%%\ndu hast %%dept%%€ Schulden.\nBitte überweise diesen Betrag an das Konto:\n\n%%if_is_black%%Weil du zu hohe Schulden hast, bist du geschwärzt%%end_if_is_black%%\nLiebe Grüße,\nDein Bierbaron" self.masMessageStandardSubject = u"Baroness - Bierrechnung"