upd: move external keywords to own class

[gigi.git] / src / org / cacert / gigi / pages / LoginPage.java

diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java
index 69b05887bb0babd9d381603504031e8cccb55d2e..29b33aa4b2cba169df38412fcb1864794b9a643b 100644 (file)
--- a/src/org/cacert/gigi/pages/LoginPage.java
+++ b/src/org/cacert/gigi/pages/LoginPage.java
@@ -62,7 +62,7 @@ public class LoginPage extends Page {
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        if (req.getHeader("Host").equals(ServerConstants.getSecureHostNamePort())) {
+        if (req.getHeader("Host").equals(ServerConstants.getSecureHostNamePortSecure())) {
             resp.getWriter().println(getLanguage(req).getTranslation("Authentication with certificate failed. Try another certificate or use a password."));
         } else {
             new LoginForm(req).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
@@ -96,7 +96,7 @@ public class LoginPage extends Page {
     }
 
     private static String redirectPath(HttpServletRequest req) {
-        String redir = (String) req.getSession().getAttribute(LOGIN_RETURNPATH);
+        String redir = (String) req.getAttribute(LOGIN_RETURNPATH);
         String s = redir;
         if (s != null) {
             if ( !s.startsWith("/")) {
@@ -194,6 +194,7 @@ public class LoginPage extends Page {
         if (user.isInGroup(LOGIN_BLOCKED)) {
             return;
         }
+        req.setAttribute(LOGIN_RETURNPATH, req.getSession().getAttribute(LOGIN_RETURNPATH));
         req.getSession().invalidate();
         HttpSession hs = req.getSession();
         hs.setAttribute(LOGGEDIN, true);