UPD: display login method

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 54c1ecf8437123575ee16a519c2f8800191bf089..4e96e9a0477f568dbf1570f446463964f20d902b 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -69,6 +69,8 @@ public class Gigi extends HttpServlet {
 
     public static final String USER = "user";
 
+    public static final String LOGIN_METHOD = "org.cacert.gigi.loginMethod";
+
     private static final long serialVersionUID = -6386785421902852904L;
 
     private Template baseTemplate;
@@ -303,17 +305,20 @@ public class Gigi extends HttpServlet {
 
                 }
             };
+            Language lang = Page.getLanguage(req);
+
             vars.put(Menu.USER_VALUE, currentPageUser);
             vars.put("menu", rootMenu);
-            vars.put("title", Page.getLanguage(req).getTranslation(p.getTitle()));
+            vars.put("title", lang.getTranslation(p.getTitle()));
             vars.put("static", getStaticTemplateVar(isSecure));
             vars.put("year", Calendar.getInstance().get(Calendar.YEAR));
             vars.put("content", content);
             if (currentPageUser != null) {
                 vars.put("loggedInAs", currentPageUser.getName().toString());
+                vars.put("loginMethod", lang.getTranslation((String) req.getSession().getAttribute(LOGIN_METHOD)));
             }
             resp.setContentType("text/html; charset=utf-8");
-            baseTemplate.output(resp.getWriter(), Page.getLanguage(req), vars);
+            baseTemplate.output(resp.getWriter(), lang, vars);
         } else {
             resp.sendError(404, "Page not found.");
         }

diff --git a/src/org/cacert/gigi/Gigi.templ b/src/org/cacert/gigi/Gigi.templ
index dc9c08befd7e63943b89ffa8df1ac49c5b41c3a9..478c9e9bbca1a89cf1920bcf37b27ce05804cab3 100644 (file)
--- a/src/org/cacert/gigi/Gigi.templ
+++ b/src/org/cacert/gigi/Gigi.templ
@@ -20,7 +20,7 @@
                        </div>
                </div>
                <div id="pageNav">
-                       <? if($loggedInAs) { ?><div><?=_Logged in as?>: <?=$loggedInAs?></div><? } ?>
+                       <? if($loggedInAs) { ?><div><?=_Logged in as?>: <?=$loggedInAs?> <?=_with?> <?=$loginMethod?></div><? } ?>
                        <?=$menu?>
                        <div>
                                <h3 class="pointer"><?=_Advertising?></h3>

diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java
index 128855fcf0dced4e2ed690cfda5c92fdc887ed88..ed01ceb6ccc90e9817cbe1fc64546f136ecaa08e 100644 (file)
--- a/src/org/cacert/gigi/pages/LoginPage.java
+++ b/src/org/cacert/gigi/pages/LoginPage.java
@@ -107,6 +107,7 @@ public class LoginPage extends Page {
                     gps.executeUpdate();
                 }
                 loginSession(req, User.getById(rs.getInt(2)));
+                req.getSession().setAttribute(LOGIN_METHOD, "Password");
             }
         }
         rs.close();
@@ -125,6 +126,7 @@ public class LoginPage extends Page {
             loginSession(req, User.getById(rs.getInt(1)));
             req.getSession().setAttribute(CERT_SERIAL, serial);
             req.getSession().setAttribute(CERT_ISSUER, x509Certificate.getIssuerDN());
+            req.getSession().setAttribute(LOGIN_METHOD, "Certificate");
         }
         rs.close();
     }