diff --git a/.gitignore b/.gitignore index 1d40e0537e5f4894bc7867676e6bfd9227d0c563..6b68c7ef19a951ef003a367cc7df34f50da38834 100644 --- a/.gitignore +++ b/.gitignore @@ -116,4 +116,5 @@ environment.bat .vscode/ #media -/media/* \ No newline at end of file +/media/* +staticfiles \ No newline at end of file diff --git a/src/common/email.py b/src/common/email.py index ffb32b274836aef944ce8fdeead4ced50ecc8c80..838bf7f82e0ee173533cf312f93a9d214a5fcf5b 100644 --- a/src/common/email.py +++ b/src/common/email.py @@ -1,21 +1,31 @@ from django.core.mail import send_mail import codecs +import sys + + sender_email = 'noreply@ujonc.kszk.bme.hu' link = 'https://ujonc.kszk.bme.hu/homework' def read_email(name): - with codecs.open('common/emails/' + name, 'r', 'utf-8') as myfile: + with codecs.open('src/common/emails/' + name, 'r', 'utf-8') as myfile: data = myfile.read() return data +def send_out_mail(subject, message, sender_email, receiver_email): + if 'runserver' in sys.argv: + # It is in development + print("Email sent from: " + str(sender_email) + " to: " + str(receiver_email)) + else: + send_mail(subject, message, sender_email, [receiver_email, ]) + def registration(user): subject = "Kszképzés regisztráció" message = read_email('registration.txt') message = str.format(message % {'name': user.get_full_name()}) - send_mail(subject, message, sender_email, [user.email, ]) + send_out_mail(subject, message, sender_email, [user.email, ]) pass @@ -23,7 +33,7 @@ def admitted(user): subject = "Jelentkezés eredménye" message = read_email('admitted.txt') message = str.format(message % {'name': user.get_full_name()}) - send_mail(subject, message, sender_email, [user.email, ]) + send_out_mail(subject, message, sender_email, [user.email, ]) pass @@ -31,7 +41,7 @@ def denied(user): subject = "Jelentkezés eredménye" message = read_email('denied.txt') message = str.format(message % {'name': user.get_full_name()}) - send_mail(subject, message, sender_email, [user.email, ]) + send_out_mail(subject, message, sender_email, [user.email, ]) pass @@ -41,7 +51,7 @@ def new_homework(user, deadline): message = read_email('new_homework.txt') message = str.format( message % {'name': user.get_full_name(), 'link': link, 'deadline': deadline}) - send_mail(subject, message, sender_email, [user.email, ]) + send_out_mail(subject, message, sender_email, [user.email, ]) pass @@ -54,5 +64,5 @@ def homework_corrected(user, title, accepted): message = read_email('homework_corrected.txt') message = str.format(message % {'name': user.get_full_name( ), 'link': link, 'status': status, 'title': title}) - send_mail(subject, message, sender_email, [user.email, ]) + send_out_mail(subject, message, sender_email, [user.email, ]) pass