add: Allow multiple names, name-schemes, multi-name-assurance, etc.

[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 2f2c25d253edc60c985035d19f0720f91a91c098..2ffd12e2085882175260683572bb7c815230452d 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
@@ -17,6 +17,7 @@ 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 {
 
@@ -47,7 +48,7 @@ public class TTPAdminPage extends Page {
             int id = Integer.parseInt(path.substring(1 + PATH.length()));
             User u = User.getById(id);
             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("!\"<a href='" + PATH + "'>", "!\"</a>"));
+                SprintfCommand command = new SprintfCommand("The TTP-request is not available anymore. You might want to go {0}back{1}.", Arrays.asList("!'<a href=\"" + PATH + "\">", "!'</a>"));
                 req.setAttribute(PageNotFound.MESSAGE_ATTRIBUTE, command);
                 resp.sendError(404);
                 return;
@@ -73,7 +74,7 @@ public class TTPAdminPage extends Page {
                     return false;
                 }
                 vars.put("id", Integer.toString(users[i].getId()));
-                vars.put("name", users[i].getName().toString());
+                vars.put("name", users[i].getPreferredName().toString());
                 vars.put("email", users[i].getEmail());
 
                 i++;
@@ -87,7 +88,7 @@ public class TTPAdminPage extends Page {
     }
 
     @Override
-    public boolean isPermitted(User u) {
-        return u != null && u.isInGroup(Group.getByString("ttp-assurer"));
+    public boolean isPermitted(AuthorizationContext ac) {
+        return ac != null && ac.isInGroup(Group.getByString("ttp-assurer"));
     }
 }