add: ensure that for Org Administrator actions certificate login is used

[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 53cad4a02f41fe1f05feae86bae4bc7a5834645a..7fb5228e0df1a425c9bfa4083b2305a7672586e5 100644 (file)
--- a/src/club/wpia/gigi/pages/MainPage.java
+++ b/src/club/wpia/gigi/pages/MainPage.java
@@ -40,12 +40,7 @@ public class MainPage extends Page {
             vars.put("ra-agent", u.canVerify());
             vars.put("vp", u.getVerificationPoints());
             vars.put("xp", u.getExperiencePoints());
             vars.put("ra-agent", u.canVerify());
             vars.put("vp", u.getVerificationPoints());
             vars.put("xp", u.getExperiencePoints());

-            if (u.isInGroup(Group.SUPPORTER) || u.isInGroup(Group.ORG_AGENT) || u.isInGroup(Group.TTP_AGENT) || u.canVerify()) {
-                vars.put("certlogin", LoginPage.getAuthorizationContext(req).isStronglyAuthenticated());
-                vars.put("certlogininfo", true);
-            } else {
-                vars.put("certlogininfo", false);
-            }
+

             Certificate[] c = u.getCertificates(false);
             vars.put("c-no", c.length);
 
             Certificate[] c = u.getCertificates(false);
             vars.put("c-no", c.length);
 


@@ -106,6 +101,14 @@ public class MainPage extends Page {
                 }
             });
             vars.put("hasorgs", !o.isEmpty());
                 }
             });
             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 {
             getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
 
         } else {