From 430e0f60aa82412d8f554ce4b29a4fcfc5037b52 Mon Sep 17 00:00:00 2001
From: Yannik Schmidt <yannik.schmidt@thermoscan.de>
Date: Tue, 1 Sep 2020 17:38:54 +0200
Subject: [PATCH] fix typos

---
 server.py |  3 +++
 smtp.py   | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/server.py b/server.py
index a5fa9bf..c31a9dd 100755
--- a/server.py
+++ b/server.py
@@ -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/"
diff --git a/smtp.py b/smtp.py
index 254387c..65358be 100644
--- a/smtp.py
+++ b/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:
@@ -22,11 +21,12 @@ def checkSMTPConnection(app):
 def sendMailFromHtmlForm(app, htmlForm):
     '''Take the app config and the contact HTML-form and send a mail accordingly'''
 
-    email = htmlForm["email"]
-    name  = htmlForm["name"]
+    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)