From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001 From: Gerard Smyth <gerard.smyth@gmail.com> Date: Thu, 08 May 2014 13:09:30 -0400 Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored. --- src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java index 302de0d..4c8d3a1 100644 --- a/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java +++ b/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java @@ -25,7 +25,6 @@ import org.apache.wicket.model.Model; import org.apache.wicket.protocol.http.WebResponse; -import com.gitblit.GitBlit; import com.gitblit.GitBlitException; import com.gitblit.Keys; import com.gitblit.models.UserModel; @@ -45,16 +44,16 @@ throw new RestartResponseException(getApplication().getHomePage()); } - if (!GitBlit.getBoolean(Keys.web.authenticateAdminPages, true) - && !GitBlit.getBoolean(Keys.web.authenticateViewPages, false)) { + if (!app().settings().getBoolean(Keys.web.authenticateAdminPages, true) + && !app().settings().getBoolean(Keys.web.authenticateViewPages, false)) { // no authentication enabled throw new RestartResponseException(getApplication().getHomePage()); } UserModel user = GitBlitWebSession.get().getUser(); - if (!GitBlit.self().supportsCredentialChanges(user)) { + if (!app().authentication().supportsCredentialChanges(user)) { error(MessageFormat.format(getString("gb.userServiceDoesNotPermitPasswordChanges"), - GitBlit.getString(Keys.realm.userService, "${baseFolder}/users.conf")), true); + app().settings().getString(Keys.realm.userService, "${baseFolder}/users.conf")), true); } setupPage(getString("gb.changePassword"), user.username); @@ -74,7 +73,7 @@ } // ensure password satisfies minimum length requirement - int minLength = GitBlit.getInteger(Keys.realm.minPasswordLength, 5); + int minLength = app().settings().getInteger(Keys.realm.minPasswordLength, 5); if (minLength < 4) { minLength = 4; } @@ -86,7 +85,7 @@ UserModel user = GitBlitWebSession.get().getUser(); // convert to MD5 digest, if appropriate - String type = GitBlit.getString(Keys.realm.passwordStorage, "md5"); + String type = app().settings().getString(Keys.realm.passwordStorage, "md5"); if (type.equalsIgnoreCase("md5")) { // store MD5 digest of password password = StringUtils.MD5_TYPE + StringUtils.getMD5(password); @@ -98,10 +97,10 @@ user.password = password; try { - GitBlit.self().updateUserModel(user.username, user, false); - if (GitBlit.getBoolean(Keys.web.allowCookieAuthentication, false)) { + app().gitblit().reviseUser(user.username, user); + if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) { WebResponse response = (WebResponse) getRequestCycle().getResponse(); - GitBlit.self().setCookie(response, user); + app().authentication().setCookie(response.getHttpServletResponse(), user); } } catch (GitBlitException e) { error(e.getMessage()); -- Gitblit v1.9.1