diff --git a/etc/contact-form/config.ini b/etc/contact-form/config.ini index b6504ee..5c0605d 100644 --- a/etc/contact-form/config.ini +++ b/etc/contact-form/config.ini @@ -5,5 +5,7 @@ db_path = /tmp/contact-form.db captcha_timout = 3600 [email] +sender = email@example.com reciever = email@example.com -server = localhost \ No newline at end of file +server = localhost +subject = contact to katzei \ No newline at end of file diff --git a/templates/form.html b/templates/form.html index 12ca206..cc79a80 100644 --- a/templates/form.html +++ b/templates/form.html @@ -5,24 +5,6 @@ - @@ -44,7 +26,7 @@
- +
{% if captcha_error %}
Le captcha est invalide veuillez réessayer
diff --git a/webapp.py b/webapp.py index 40c98d7..2e42881 100644 --- a/webapp.py +++ b/webapp.py @@ -52,6 +52,8 @@ def generate_captacha(): first_number = random.randrange(10) second_number = random.randrange(10) op_text, op_func = random.choice(OPERATORS) + if op_text == "-" and first_number < second_number: + first_number, second_number = second_number, first_number result = op_func(first_number, second_number) captcha = Captcha( token=token_urlsafe(67), @@ -81,14 +83,24 @@ def validate_captcha(token, value): def send_email(sender, message): - email = EmailMessage() - email.set_content(message) - email["From"] = sender - email["To"] = config.get("email", "reciever") + katzei_email = EmailMessage() + katzei_email.set_content(message) + katzei_email["From"] = sender + katzei_email["To"] = config.get("email", "reciever") + katzei_email["Subject"] = config.get("email", "subject") + + contact_email = EmailMessage() + contact_email.set_content(message) + contact_email["From"] = config.get("email", "sender") + contact_email["To"] = sender + contact_email["Subject"] = config.get("email", "subject") + smtp = SMTP(config.get("email", "server")) - smtp.send_message(email) + smtp.send_message(katzei_email) + smtp.send_message(contact_email) smtp.quit() + @app.route(config.get("app", "path"), methods=["GET"]) def get_form(context=None): context = (context or {}) | generate_captacha() @@ -107,3 +119,5 @@ def validate_form(): return get_form(context=context) send_email(sender=form["email"], message=form["message"]) return flask.render_template("success.html") + +application=app \ No newline at end of file