Merge branch 'main' into lang_de

src/main/java/de/srsoftware/widerhall/web/TemplateServlet.java

@@ -1,6 +1,7 @@
 package de.srsoftware.widerhall.web;
 
 import de.srsoftware.widerhall.Configuration;
+import org.stringtemplate.v4.ST;
 import org.stringtemplate.v4.STGroup;
 import org.stringtemplate.v4.STRawGroupDir;
 
@@ -8,7 +9,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.Map;
 
@@ -24,6 +24,10 @@ public abstract class TemplateServlet extends HttpServlet {
         loadTemplates();
     }
 
+    protected ST getTemplate(String name){
+        return templates.getInstanceOf(name);
+    }
+
     protected String loadFile(String filename, HttpServletResponse resp) {
         var path = String.join(File.separator,baseDir,"static",filename);
         var file = new File(path);

src/main/java/de/srsoftware/widerhall/web/Web.java

@@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory;
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.HEAD;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.security.InvalidKeyException;
@@ -142,8 +143,12 @@ public class Web extends TemplateServlet {
         try {
             var token = req.getParameter(TOKEN);
             if (token== null || token.isBlank()) return t("Ungültiger oder fehlender Token!");
-            var user = ListMember.confirm(token);
-            if (user != null) return loadTemplate(INDEX,Map.of(USER,user.safeMap(),NOTES,"Listen-Mitgliedschaft bestätigt!"),resp);
+            var listMember = ListMember.confirm(token);
+            if (listMember != null) {
+                listMember.sendConfirmationMail(getTemplate("confirmation_mail"));
+
+                return loadTemplate(INDEX,Map.of(USER,listMember.user().safeMap(),NOTES,"Listen-Mitgliedschaft bestätigt!"),resp);
+            }
             return t("Nutzer oder Token unbekannt");
         } catch (Exception e) {
             LOG.debug("Bestätigung des Listen-Abonnements fehlgeschlagen:",e);
@@ -517,7 +522,7 @@ public class Web extends TemplateServlet {
         }
 
         try {
-            list.requestSubscription(user,skipConfirmation);
+            list.requestSubscription(user,skipConfirmation,getTemplate("subscribe_mail"));
             if (skipConfirmation) {
                 data.put(NOTES, t("'{}' hat die Mailingliste '{}' erfolgreich abonniert.", user.email(), list.email()));
             } else {