You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by si...@apache.org on 2008/08/15 22:20:35 UTC
svn commit: r686356 -
/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
Author: sichen
Date: Fri Aug 15 13:20:34 2008
New Revision: 686356
URL: http://svn.apache.org/viewvc?rev=686356&view=rev
Log:
reverted last commit
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=686356&r1=686355&r2=686356&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Fri Aug 15 13:20:34 2008
@@ -418,15 +418,6 @@
Debug.logInfo("[RequestHandler.doRequest]: Response is a Request redirect with no parameters." + " sessionId=" + UtilHttp.getSessionId(request), module);
nextView = nextView.substring(25);
callRedirect(makeLink(request, response, nextView), response, request);
- } else if (nextView != null && nextView.startsWith("request-redirect-filterparam:")) {
- // check for a Request redirect
- Debug.logInfo("[RequestHandler.doRequest]: Response is a Request redirect with filtered parameters." + " sessionId=" + UtilHttp.getSessionId(request), module);
- nextView = nextView.substring(29);
- Set allowedParams = (Set)requestManager.getRequestMapMap(requestUri).get(ConfigXMLReader.RESPONSE_MAP).get(ConfigXMLReader.RESPONSE_ALLOWEDPARAMS);
- Set allowedAttributes = (Set)requestManager.getRequestMapMap(requestUri).get(ConfigXMLReader.RESPONSE_MAP).get(ConfigXMLReader.RESPONSE_ALLOWEDATTRIBUTES);
- if (allowedParams != null) Debug.logInfo("Filtering parameters : "+allowedParams, module);
- if (allowedAttributes != null) Debug.logInfo("Filtering attributes : "+allowedAttributes, module);
- callRedirect(makeLinkWithQueryString(request, response, "/" + nextView, allowedParams, allowedAttributes), response, request);
} else if (nextView != null && nextView.startsWith("view:")) {
// check for a View
Debug.logInfo("[RequestHandler.doRequest]: Response is a view." + " sessionId=" + UtilHttp.getSessionId(request), module);
@@ -475,23 +466,12 @@
queryString.append(name);
queryString.append("=");
queryString.append(value);
- } else {
- Debug.logInfo("found param not a String: "+name+" = "+value, module);
}
-
}
}
return queryString.toString();
}
- public String makeQueryString(HttpServletRequest request, Set allowedParams) {
- return makeQueryString(request, null, null);
- }
-
- public String makeQueryString(HttpServletRequest request) {
- return makeQueryString(request, null);
- }
-
/** Returns the RequestManager Object. */
public RequestManager getRequestManager() {
return requestManager;
@@ -716,16 +696,12 @@
}
- public String makeLinkWithQueryString(HttpServletRequest request, HttpServletResponse response, String url, Set allowedParams, Set allowedAttributes) {
+ public String makeLinkWithQueryString(HttpServletRequest request, HttpServletResponse response, String url) {
String initialLink = this.makeLink(request, response, url);
- String queryString = this.makeQueryString(request, allowedParams, allowedAttributes);
+ String queryString = this.makeQueryString(request);
return initialLink + queryString;
}
- public String makeLinkWithQueryString(HttpServletRequest request, HttpServletResponse response, String url) {
- return makeLinkWithQueryString(request, response, url, null, null);
- }
-
public String makeLink(HttpServletRequest request, HttpServletResponse response, String url) {
return makeLink(request, response, url, false, false, true);
}