import club.wpia.gigi.dbObjects.Organisation;
import club.wpia.gigi.dbObjects.User;
import club.wpia.gigi.localisation.Language;
-import club.wpia.gigi.output.GroupIterator;
+import club.wpia.gigi.output.GroupList;
import club.wpia.gigi.output.template.IterableDataset;
import club.wpia.gigi.output.template.Template;
User u = LoginPage.getUser(req);
vars.put("username", u.getPreferredName());
final Set<Group> gr = u.getGroups();
- vars.put("support-groups", new GroupIterator(gr.iterator(), true));
- vars.put("groups", new GroupIterator(gr.iterator(), false));
+ vars.put("support-groups", new GroupList(gr, true));
+ vars.put("groups", new GroupList(gr, false));
vars.put("ra-agent", u.canVerify());
vars.put("vp", u.getVerificationPoints());
vars.put("xp", u.getExperiencePoints());
+
+ vars.put("catsinfo", false);
+ if (u.canVerify() && !u.hasValidRAChallenge()) {
+ vars.put("catsinfo", true);
+ vars.put("catsra", true);
+ }
Certificate[] c = u.getCertificates(false);
vars.put("c-no", c.length);
}
});
vars.put("hasorgs", !o.isEmpty());
+
+ if (u.isInGroup(Group.SUPPORTER) || u.isInGroup(Group.ORG_AGENT) || u.isInGroup(Group.TTP_AGENT) || u.canVerify() || !o.isEmpty()) {
+ vars.put("certlogin", LoginPage.getAuthorizationContext(req).isStronglyAuthenticated());
+ vars.put("certlogininfo", true);
+ } else {
+ vars.put("certlogininfo", false);
+ }
+
getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
} else {