X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2FTTPAdminForm.java;h=8b38b18d30cfb2b9526428e4e8ae5c94a4055182;hp=69f07827c6b8b2e2f1d33cb6b4a42bf71abf7e8c;hb=17a15662212d973d12ed4cea3f5eaa9c0d1169ed;hpb=cd14b85c60f736a643842b421b11f41d8fca86c7 diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java b/src/org/cacert/gigi/pages/admin/TTPAdminForm.java index 69f07827..8b38b18d 100644 --- 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.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 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); }