You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/05/26 09:00:06 UTC
svn commit: r178613 - in /lenya/trunk/src: confpatch/pipelines.xmap
java/org/apache/lenya/cms/ac/usecases/Login.java
Author: andreas
Date: Thu May 26 00:00:04 2005
New Revision: 178613
URL: http://svn.apache.org/viewcvs?rev=178613&view=rev
Log:
forward query string during login usecase
Modified:
lenya/trunk/src/confpatch/pipelines.xmap
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Login.java
Modified: lenya/trunk/src/confpatch/pipelines.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/confpatch/pipelines.xmap?rev=178613&r1=178612&r2=178613&view=diff
==============================================================================
--- lenya/trunk/src/confpatch/pipelines.xmap (original)
+++ lenya/trunk/src/confpatch/pipelines.xmap Thu May 26 00:00:04 2005
@@ -95,7 +95,7 @@
<map:act type="authorizer">
<map:mount uri-prefix="" src="global-sitemap.xmap" check-reload="true" reload-method="synchron"/>
</map:act>
- <map:redirect-to uri="{request:requestURI}?lenya.usecase=ac.login" session="true"/>
+ <map:redirect-to uri="{request:requestURI}?lenya.usecase=ac.login&referrerQueryString={request:queryString}" session="true"/>
</map:match>
<map:handle-errors>
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Login.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Login.java?rev=178613&r1=178612&r2=178613&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Login.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Login.java Thu May 26 00:00:04 2005
@@ -26,10 +26,12 @@
/**
* Usecase to login a user.
*
- * @version $Id: Login.java 124001 2005-01-03 16:27:21Z andreas $
+ * @version $Id$
*/
public class Login extends AccessControlUsecase {
+ protected static final String REFERRER_QUERY_STRING = "referrerQueryString";
+
/**
* Ctor.
*/
@@ -52,7 +54,6 @@
if (password.length() == 0) {
addErrorMessage("Please enter a password.");
}
-
}
/**
@@ -70,10 +71,20 @@
Request request = ObjectModelHelper.getRequest(objectModel);
request.getSession(true);
if (getAccessController().authenticate(request)) {
- setTargetURL(request.getRequestURI());
- } else {
- addErrorMessage("Authentication failed");
+ setTargetURL(request.getRequestURI());
+ } else {
+ addErrorMessage("Authentication failed");
}
- }
+ }
-}
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#getExitUsecaseQueryString()
+ */
+ protected String getExitUsecaseQueryString() {
+ String queryString = getParameterAsString(REFERRER_QUERY_STRING);
+ if (queryString != null && !queryString.equals("")) {
+ queryString = "?" + queryString;
+ }
+ return queryString;
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org