upd: use a more strict pattern for handling forms

[gigi.git] / src / org / cacert / gigi / pages / admin / TTPAdminForm.java

diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java b/src/org/cacert/gigi/pages/admin/TTPAdminForm.java
index f3c9b76a2c645f08677e383a0a0da5687c1f4146..8b38b18d30cfb2b9526428e4e8ae5c94a4055182 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminForm.java
@@ -8,14 +8,13 @@ import javax.servlet.http.HttpServletRequest;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.DateSelector;
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 
 public class TTPAdminForm extends Form {
 
-    private static Template t = new Template(TTPAdminForm.class.getResource("TTPAdminForm.templ"));
+    private static final Template t = new Template(TTPAdminForm.class.getResource("TTPAdminForm.templ"));
 
     User u;
 
@@ -28,7 +27,7 @@ public class TTPAdminForm extends Form {
     }
 
     @Override
-    public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
+    public boolean submit(HttpServletRequest req) throws GigiApiException {
         if (req.getParameter("deny") != null) {
             u.revokeGroup(ttpAdmin, TTPAdminPage.TTP_APPLICANT);
         }
@@ -37,9 +36,9 @@ public class TTPAdminForm extends Form {
 
     @Override
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
-        vars.put("name", u.getName());
+        vars.put("name", u.getPreferredName());
         vars.put("email", u.getEmail());
-        vars.put("DoB", DateSelector.getDateFormat().format(u.getDob()));
+        vars.put("DoB", u.getDoB());
         vars.put("uid", Integer.toString(u.getId()));
         t.output(out, l, vars);
     }