add: ensure that for OrgAdmin action there is a valid OrgAdmin Challenge

[gigi.git] / src / club / wpia / gigi / pages / MainPage.java

diff --git a/src/club/wpia/gigi/pages/MainPage.java b/src/club/wpia/gigi/pages/MainPage.java
index e0170185982d4a1c3caf1492a09e5b4333dfa55f..02232f2e412808663388d95ed851ed5e06d15ae3 100644 (file)
--- a/src/club/wpia/gigi/pages/MainPage.java
+++ b/src/club/wpia/gigi/pages/MainPage.java
@@ -55,6 +55,10 @@ public class MainPage extends Page {
                 vars.put("catsinfo", true);
                 vars.put("catsorgagent", true);
             }
+            if (u.isInGroup(Group.TTP_AGENT) && !u.hasValidTTPAgentChallenge()) {
+                vars.put("catsinfo", true);
+                vars.put("catsttpagent", true);
+            }
 
             Certificate[] c = u.getCertificates(false);
             vars.put("c-no", c.length);
@@ -124,6 +128,11 @@ public class MainPage extends Page {
                 vars.put("certlogininfo", false);
             }
 
+            if ( !o.isEmpty() && !u.hasValidOrgAdminChallenge()) {
+                vars.put("catsinfo", true);
+                vars.put("catsorgadmin", true);
+            }
+
             getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
 
         } else {