mirror of
https://github.com/FAUSheppy/flask-json-dream-website
synced 2025-12-06 08:11:35 +01:00
fix typos
This commit is contained in:
@@ -16,6 +16,9 @@ from werkzeug.routing import BuildError
|
||||
from werkzeug.utils import ImportStringError
|
||||
import xml.etree.ElementTree as et
|
||||
|
||||
# import project files
|
||||
import smtp
|
||||
|
||||
# paths
|
||||
SECTIONS_DIR = "sections/"
|
||||
NEWS_DIR = "news/"
|
||||
|
||||
8
smtp.py
8
smtp.py
@@ -1,19 +1,18 @@
|
||||
import sys
|
||||
import smtplib
|
||||
import smtplib.SMTPException
|
||||
|
||||
def checkSMTPConnection(app):
|
||||
'''Check connection and login on SMTP server configured in app config'''
|
||||
|
||||
try:
|
||||
if not all([ x in app.conf for x in ["TARGET_SMTP", "TARGET_EMAIL"]:
|
||||
if not all([ x in app.config and app.config[x] for x in ["TARGET_SMTP", "TARGET_EMAIL"]]):
|
||||
raise smtplib.SMTPException("Missing Configuration.")
|
||||
smtpTarget = smtplib.SMTP(app.config["TARGET_SMTP"])
|
||||
if app.config["TARGET_SMTP_USER"] and app.config["TARGET_SMTP_PASSWORD"]:
|
||||
smtp.login(app.config["TARGET_SMTP_USER"], app.config["TARGET_SMTP_PASSWORD"])
|
||||
smtpTarget.quit()
|
||||
except smtplib.SMTPException as e:
|
||||
if app.config["STMP_MUST_BE_CONNECTED"]:
|
||||
if app.config["SMTP_MUST_BE_CONNECTED"]:
|
||||
print(e, file=sys.stderr)
|
||||
sys.exit(1)
|
||||
else:
|
||||
@@ -25,8 +24,9 @@ def sendMailFromHtmlForm(app, htmlForm):
|
||||
email = htmlForm["email"]
|
||||
name = htmlForm["name"]
|
||||
message = htmlForm["message"]
|
||||
subject = htmlForm["subject"]
|
||||
|
||||
subject = "Subject: {} ({})\n\n".format(flask.request.form["subject"], name)
|
||||
subject = "Subject: {} ({})\n\n".format(subject, name)
|
||||
|
||||
smtpTarget = smtplib.SMTP(app.config["TARGET_SMTP"])
|
||||
smtpTarget.sendmail(email, app.config["TARGET_EMAIL"] , message)
|
||||
|
||||
Reference in New Issue
Block a user