From 0c863bce227c2eadee0f176dccb1b81dd54aac46 Mon Sep 17 00:00:00 2001 From: Benni Baermann Date: Tue, 5 Oct 2021 11:49:57 +0200 Subject: [PATCH] stripped html-tags from emails --- TODO | 7 ------- input/templates/input/if_mail.txt | 2 +- input/templates/input/ifg_volunteer_mail.txt | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/TODO b/TODO index c34b962..bf3b23d 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,5 @@ known bugs: -- there is html-code in some plain text mails, because they use - models.TYPE_CHOICES, which is in html, because it is mainly used for the - webside side of things. - - helptext by /intern email: "Bitte gib deine E-Mail-Adresse ein, damit dich Wikimedia Deutschland bei Rückfragen oder für die Zusage kontaktieren kann." maybe this this misleading? @@ -11,9 +7,6 @@ die Zusage kontaktieren kann." maybe this this misleading? - if the mailserver is unavaiable we just produce "Server Error 500", which is not very telling. There should maybe also a way to handle mails later if first delivery failed. -- there are some issues with the ifg_volunteer_mail.txt template. - -- project.pk generation fails at the moment (seond save() in old code) other known problems: diff --git a/input/templates/input/if_mail.txt b/input/templates/input/if_mail.txt index d00fe5b..e1c6ef5 100644 --- a/input/templates/input/if_mail.txt +++ b/input/templates/input/if_mail.txt @@ -2,7 +2,7 @@ Hallo Team Ideenförderung, es gab einen neuen Antrag von {{data.realname}}. -Der Nutzer mit dem Username {{data.username}} ({{data.email}}) fragt ein_e {{data.typestring}} an. +Der Nutzer mit dem Username {{data.username}} ({{data.email}}) fragt ein_e {{data.typestring|striptags}} an. {% if data.choice in data.grant %} Vorraussichtliche Kosten: {{data.cost}} Anmerkungen: {{data.notes}} {% endif %} {% if data.choice in data.domain %} diff --git a/input/templates/input/ifg_volunteer_mail.txt b/input/templates/input/ifg_volunteer_mail.txt index 2a8f0dc..f0efa71 100644 --- a/input/templates/input/ifg_volunteer_mail.txt +++ b/input/templates/input/ifg_volunteer_mail.txt @@ -1,6 +1,6 @@ Hallo {{data.realname}}, -wir haben Deine Anfrage ({{data.typestring}}) erhalten. +wir haben Deine Anfrage ({{data.typestring|striptags}}) erhalten. {% if data.choice in data.grant %} Vorraussichtliche Kosten: {{data.cost}} Anmerkungen: {{data.notes}} {% endif %} {% if data.choice in data.domain %}