X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2FTTPAdminPage.java;h=a6bd0d47308a1d0972b52357e5e7a9dbc9e070f4;hb=1e5293e284e84388dd13fcddb4b48d99986426b5;hp=1bb6e4cd26c22ff324cf11e81f0e542a25b90abf;hpb=e8011a7009c1e8e918ebe975a11f6f02040d6377;p=gigi.git
diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
index 1bb6e4cd..a6bd0d47 100644
--- a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
@@ -1,6 +1,7 @@
package org.cacert.gigi.pages.admin;
import java.io.IOException;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -11,9 +12,12 @@ import org.cacert.gigi.GigiApiException;
import org.cacert.gigi.dbObjects.Group;
import org.cacert.gigi.dbObjects.User;
import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;
import org.cacert.gigi.output.template.IterableDataset;
+import org.cacert.gigi.output.template.SprintfCommand;
import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.pages.error.PageNotFound;
+import org.cacert.gigi.util.AuthorizationContext;
public class TTPAdminPage extends Page {
@@ -40,10 +44,13 @@ public class TTPAdminPage extends Page {
@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
String path = req.getPathInfo();
- if (path != null && path.length() > PATH.length()) {
+ if (path != null && path.length() > PATH.length() + 1) {
int id = Integer.parseInt(path.substring(1 + PATH.length()));
User u = User.getById(id);
- if ( !u.isInGroup(TTP_APPLICANT)) {
+ if (u == null || !u.isInGroup(TTP_APPLICANT)) {
+ SprintfCommand command = new SprintfCommand("The TTP-request is not available anymore. You might want to go {0}back{1}.", Arrays.asList("!'", "!'"));
+ req.setAttribute(PageNotFound.MESSAGE_ATTRIBUTE, command);
+ resp.sendError(404);
return;
}
new TTPAdminForm(req, u).output(resp.getWriter(), getLanguage(req), new HashMap());
@@ -81,7 +88,7 @@ public class TTPAdminPage extends Page {
}
@Override
- public boolean isPermitted(User u) {
- return u != null && u.isInGroup(Group.getByString("ttp-assuer"));
+ public boolean isPermitted(AuthorizationContext ac) {
+ return ac != null && ac.isInGroup(Group.getByString("ttp-assurer"));
}
}