Hybris95
2014-04-17 75796a0e2798e256a94f725961c9676746fc107a
src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -173,6 +173,7 @@
         pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class,
               getRootPageParameters()));
         pages.add(new PageRegistration("gb.activity", ActivityPage.class, getRootPageParameters()));
         //pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class, getRootPageParameters()));
         if (app().settings().getBoolean(Keys.web.allowLuceneIndexing, true)) {
            pages.add(new PageRegistration("gb.search", LuceneSearchPage.class));
         }
@@ -252,7 +253,7 @@
         // Set Cookie
         if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) {
            WebResponse response = (WebResponse) getRequestCycle().getResponse();
            app().session().setCookie(response, user);
            app().authentication().setCookie(response.getHttpServletResponse(), user);
         }
         if (!session.continueRequest()) {
@@ -536,7 +537,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 +573,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()));
         }