upd: use a more strict pattern for handling forms

[gigi.git] / src / org / cacert / gigi / pages / wot / AssurePage.java

diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java
index 508a9c62413b5b5f0807d7ee300abe94e87737be..c29b2388cd83a13e7cabd63fe9b6142b08df0603 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -16,6 +16,7 @@ import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.AuthorizationContext;
+import org.cacert.gigi.util.HTMLEncoder;
 
 public class AssurePage extends Page {
 
@@ -49,16 +50,13 @@ public class AssurePage extends Page {
         PrintWriter out = resp.getWriter();
         if (req.getParameter("search") == null) {
             AssuranceForm form = Form.getForm(req, AssuranceForm.class);
-            try {
-                if (form.submit(out, req)) {
-                    out.println(translate(req, "Verification complete."));
-                    return;
+            if (form.submitProtected(out, req)) {
+                if (form.isWithPasswordReset()) {
+                    resp.getWriter().println(HTMLEncoder.encodeHTML(translate(req, "Password reset successful.")));
                 }
-            } catch (GigiApiException e) {
-                e.format(out, Page.getLanguage(req));
-                form.output(out, getLanguage(req), new HashMap<String, Object>());
+                out.println(translate(req, "Verification complete."));
+                return;
             }
-
             return;
         }