James Moger
2015-03-07 d40a44c8c8df8f6bd81c93e72314224f85656f18
src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java
@@ -23,6 +23,7 @@
import org.apache.wicket.markup.html.form.StatelessForm;
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.GitBlitException;
@@ -51,7 +52,7 @@
      }
      UserModel user = GitBlitWebSession.get().getUser();
      if (!app().users().supportsCredentialChanges(user)) {
      if (!app().authentication().supportsCredentialChanges(user)) {
         error(MessageFormat.format(getString("gb.userServiceDoesNotPermitPasswordChanges"),
               app().settings().getString(Keys.realm.userService, "${baseFolder}/users.conf")), true);
      }
@@ -97,10 +98,12 @@
            user.password = password;
            try {
               app().gitblit().updateUserModel(user.username, user, false);
               app().gitblit().reviseUser(user.username, user);
               if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) {
                  WebRequest request = (WebRequest) getRequestCycle().getRequest();
                  WebResponse response = (WebResponse) getRequestCycle().getResponse();
                  app().session().setCookie(response.getHttpServletResponse(), user);
                  app().authentication().setCookie(request.getHttpServletRequest(),
                        response.getHttpServletResponse(), user);
               }
            } catch (GitBlitException e) {
               error(e.getMessage());