upd: enforce a more strict Form call pattern.

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

diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPPage.java b/src/org/cacert/gigi/pages/wot/RequestTTPPage.java
index a4ea66f5755f8dfe4701fd40f4aa20aff235c493..f4b739c462cadf6b6ef27caa042c62a1d6997409 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/RequestTTPPage.java
+++ b/src/org/cacert/gigi/pages/wot/RequestTTPPage.java
@@ -6,12 +6,12 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Assurance;
 import org.cacert.gigi.dbObjects.User;
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.util.AuthorizationContext;
 
 public class RequestTTPPage extends Page {
 
@@ -21,12 +21,15 @@ public class RequestTTPPage extends Page {
         super("Request TTP");
     }
 
+    @Override
+    public boolean beforePost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        return Form.getForm(req, RequestTTPForm.class).submitExceptionProtected(req, resp);
+    }
+
     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        try {
-            Form.getForm(req, RequestTTPForm.class).submit(resp.getWriter(), req);
-        } catch (GigiApiException e) {
-            e.format(resp.getWriter(), getLanguage(req));
+        if (Form.printFormErrors(req, resp.getWriter())) {
+            Form.getForm(req, RequestTTPForm.class).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
         }
     }
 
@@ -58,4 +61,9 @@ public class RequestTTPPage extends Page {
         getDefaultTemplate().output(resp.getWriter(), getLanguage(req), map);
     }
 
+    @Override
+    public boolean isPermitted(AuthorizationContext ac) {
+        return ac != null && ac.getTarget() instanceof User;
+    }
+
 }