Merge branch 'ticket/196' into develop

James Moger

2014-09-30 2654d99368054b7f8cfaec056b599cac4cfb53d9

 src/main/java/com/gitblit/wicket/pages/RootPage.java

@@ -46,6 +46,7 @@
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.protocol.http.WebResponse;

import com.gitblit.Constants;
@@ -269,20 +270,22 @@

         // Set Cookie
         if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) {
            WebRequest request = (WebRequest) getRequestCycle().getRequest();
            WebResponse response = (WebResponse) getRequestCycle().getResponse();
            app().authentication().setCookie(response.getHttpServletResponse(), user);
            app().authentication().setCookie(request.getHttpServletRequest(),
                  response.getHttpServletResponse(), user);
         }

         if (!session.continueRequest()) {
            PageParameters params = getPageParameters();
            if (params == null) {
               // redirect to this page
               setResponsePage(getClass());
               redirectTo(getClass());
            } else {
               // Strip username and password and redirect to this page
               params.remove("username");
               params.remove("password");
               setResponsePage(getClass(), params);
               redirectTo(getClass(), params);
            }
         }
      }