David Ostrovsky
2014-03-11 b799d545f37f7123aaa1ee1d0ff3b61f1f3cc8c2
src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -252,7 +252,7 @@
         // Set Cookie
         if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) {
            WebResponse response = (WebResponse) getRequestCycle().getResponse();
            app().session().setCookie(response.getHttpServletResponse(), user);
            app().authentication().setCookie(response.getHttpServletResponse(), user);
         }
         if (!session.continueRequest()) {
@@ -536,7 +536,7 @@
               String username = RootPage.this.username.getObject();
               char[] password = RootPage.this.password.getObject().toCharArray();
               UserModel user = app().session().authenticate(username, password);
               UserModel user = app().authentication().authenticate(username, password);
               if (user == null) {
                  error(getString("gb.invalidUsernameOrPassword"));
               } else if (user.username.equals(Constants.FEDERATION_USER)) {
@@ -572,12 +572,11 @@
         GitBlitWebSession session = GitBlitWebSession.get();
         UserModel user = session.getUser();
         boolean editCredentials = app().users().supportsCredentialChanges(user);
         boolean editCredentials = app().authentication().supportsCredentialChanges(user);
         boolean standardLogin = session.authenticationType.isStandard();
         if (app().settings().getBoolean(Keys.web.allowGravatar, true)) {
            add(new GravatarImage("username", user.getDisplayName(),
                  user.emailAddress, "navbarGravatar", 20, false, false));
            add(new GravatarImage("username", user, "navbarGravatar", 20, false));
         } else {
            add(new Label("username", user.getDisplayName()));
         }