add: 403-page, custom 404-message

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

diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
index d9c6740a313fe696793435357c7dad5340f7ca99..cc9a536d8d2970d7330658a0811d7bff617ff125 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
@@ -14,6 +14,7 @@ import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.pages.error.PageNotFound;
 
 public class TTPAdminPage extends Page {
 
@@ -35,19 +36,29 @@ public class TTPAdminPage extends Page {
         resp.sendRedirect(PATH);
     }
 
+    private static final int PAGE_LEN = 30;
+
     @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)) {
+                req.setAttribute(PageNotFound.MESSAGE_ATTRIBUTE, "The TTP-request is not available anymore.");
+                resp.sendError(404);
                 return;
             }
             new TTPAdminForm(req, u).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
             return;
         }
-        final User[] users = TTP_APPLICANT.getMembers(0, 30);
+        int offset = 0;
+        String offsetS = req.getParameter("offset");
+        if (offsetS != null) {
+            offset = Integer.parseInt(offsetS);
+        }
+
+        final User[] users = TTP_APPLICANT.getMembers(offset, PAGE_LEN + 1);
         HashMap<String, Object> vars = new HashMap<>();
         vars.put("users", new IterableDataset() {
 
@@ -55,7 +66,7 @@ public class TTPAdminPage extends Page {
 
             @Override
             public boolean next(Language l, Map<String, Object> vars) {
-                if (i >= users.length) {
+                if (i >= Math.min(PAGE_LEN, users.length)) {
                     return false;
                 }
                 vars.put("id", Integer.toString(users[i].getId()));
@@ -66,11 +77,14 @@ public class TTPAdminPage extends Page {
                 return true;
             }
         });
+        if (users.length == PAGE_LEN + 1) {
+            vars.put("next", Integer.toString(offset + 30));
+        }
         getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
     }
 
     @Override
     public boolean isPermitted(User u) {
-        return u != null && u.isInGroup(Group.getByString("ttp-assuer"));
+        return u != null && u.isInGroup(Group.getByString("ttp-assurer"));
     }
 }