X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2FPasswordResetPage.java;h=4090bdd49b140822e7d516a879acdf0c6f9df9e1;hp=7ba5d73c15d9599d4d3b390af2e96bf7d317519c;hb=c256866ad0f399530c686380db62b47883e3f63b;hpb=533294134fb42a02b2557c68eda45f47d77e73cc diff --git a/src/org/cacert/gigi/pages/PasswordResetPage.java b/src/org/cacert/gigi/pages/PasswordResetPage.java index 7ba5d73c..4090bdd4 100644 --- a/src/org/cacert/gigi/pages/PasswordResetPage.java +++ b/src/org/cacert/gigi/pages/PasswordResetPage.java @@ -2,7 +2,6 @@ package org.cacert.gigi.pages; import java.io.IOException; import java.io.PrintWriter; -import java.io.StringWriter; import java.net.URLEncoder; import java.util.HashMap; import java.util.Map; @@ -13,12 +12,12 @@ import javax.servlet.http.HttpServletResponse; import org.cacert.gigi.GigiApiException; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.email.SendMail; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.SprintfCommand; +import org.cacert.gigi.output.template.MailTemplate; import org.cacert.gigi.output.template.Template; import org.cacert.gigi.util.AuthorizationContext; +import org.cacert.gigi.util.HTMLEncoder; import org.cacert.gigi.util.RandomToken; import org.cacert.gigi.util.ServerConstants; @@ -34,7 +33,7 @@ public class PasswordResetPage extends Page { public static class PasswordResetForm extends Form { - private static Template t = new Template(PasswordResetForm.class.getResource("PasswordResetForm.templ")); + private static final Template t = new Template(PasswordResetForm.class.getResource("PasswordResetForm.templ")); private User u; @@ -90,14 +89,13 @@ public class PasswordResetPage extends Page { @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { PasswordResetForm form = Form.getForm(req, PasswordResetForm.class); - try { - form.submit(resp.getWriter(), req); - resp.getWriter().println(getLanguage(req).getTranslation("Password reset successful.")); + PrintWriter w = resp.getWriter(); + if (form.submitProtected(w, req)) { + w.println("