UPD: Allow 2-level wildcard pages

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 6af640ead48ddf2b83a8a2905f8415ff46c6d85d..09daf6df3ccb4c3b4d9142075ca36e9a677250b5 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -249,6 +249,17 @@ public class Gigi extends HttpServlet {
         int idx = pathInfo.lastIndexOf('/');
         pathInfo = pathInfo.substring(0, idx);
 
+        page = pages.get(pathInfo + "/*");
+        if (page != null) {
+            return page;
+        }
+
+        idx = pathInfo.lastIndexOf('/');
+        if (idx == -1) {
+            return null;
+        }
+        pathInfo = pathInfo.substring(0, idx);
+
         page = pages.get(pathInfo + "/*");
         if (page != null) {
             return page;

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
index 234448088d91f5bcaa82b1eb357f8f81c25995db..afacb56c86e3edbfda135e4aac6f2d746aace52a 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
@@ -27,9 +27,17 @@ public class SupportUserDetailsPage extends Page {
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        int id;
+        int id = -1;
         String[] idP = req.getPathInfo().split("/");
-        id = Integer.parseInt(idP[idP.length - 1]);
+        try {
+            if (req.getPathInfo().endsWith("history") || req.getPathInfo().endsWith("trainings")) {
+                id = Integer.parseInt(idP[idP.length - 2]);
+            } else {
+                id = Integer.parseInt(idP[idP.length - 1]);
+            }
+        } catch (NumberFormatException e) {
+            resp.sendError(404);
+        }
         final User user = User.getById(id);
         String ticket = (String) req.getSession().getAttribute("ticketNo" + user.getId());
         SupportUserDetailsForm f = new SupportUserDetailsForm(req, new SupportedUser(user, getUser(req), ticket));