[Sandev-cvs] sand/platform/tools/src/org/sandev/tools/UIProcessor XHTMLSandUIServlet.java, 1.38, 1.39

[Eric P. <th...@us...>]

Update of /cvsroot/sandev/sand/platform/tools/src/org/sandev/tools/UIProcessor
In directory vz-cvs-3.sog:/tmp/cvs-serv18054

Modified Files:
	XHTMLSandUIServlet.java 
Log Message:
Added a redirect URL parameter to allow returning to a different page than
what is specified as the default in the SAND UI.  Useful with multiple
interfaces to the same server are sharing the login processing.


Index: XHTMLSandUIServlet.java
===================================================================
RCS file: /cvsroot/sandev/sand/platform/tools/src/org/sandev/tools/UIProcessor/XHTMLSandUIServlet.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** XHTMLSandUIServlet.java	8 Mar 2010 23:12:58 -0000	1.38
--- XHTMLSandUIServlet.java	15 Jun 2011 18:46:45 -0000	1.39
***************
*** 145,148 ****
--- 145,154 ----
  
  
+     /**
+      * The name of the parameter holding the optional redirect URL.
+      */
+     public final static String REDIRURL = "continue";
+ 
+ 
      ////////////////////////////////////////
      // SandUI data members
***************
*** 965,970 ****
                  if((rememberme!=null)&&(!rememberme.equals(""))) {
                      writeRememberMeCookie(user,res); }
!                 wrappedRedirect(res,rewriteURL(
!                     req,getSandUI().isDefaultSecuritySecure(),null));
                  return null; } }
          UIRenderOutputString uiros=getScreenAdaptor().getUIRenderOutputString();
--- 971,979 ----
                  if((rememberme!=null)&&(!rememberme.equals(""))) {
                      writeRememberMeCookie(user,res); }
!                 String redirURL=req.getParameter(REDIRURL);
!                 if(!StringUtil.haveValue(redirURL)) {
!                     redirURL=rewriteURL(req,
!                                getSandUI().isDefaultSecuritySecure(),null); }
!                 wrappedRedirect(res,redirURL);
                  return null; } }
          UIRenderOutputString uiros=getScreenAdaptor().getUIRenderOutputString();
***************
*** 1034,1037 ****
--- 1043,1050 ----
              out.println("</code>");
              out.println("<br class=\"fieldLineBreak\"/></span>"); }
+         String redirURL=req.getParameter(REDIRURL);
+         if(StringUtil.haveValue(redirURL)) {
+             out.println("<input type=\"hidden\" name=\"" + REDIRURL + "\" " +
+                         "value=\"" + redirURL + "\"/>"); }
          out.println("<br class=\"SandUIDefaultFormatting\"/>");
          out.println("<br class=\"SandUIDefaultFormatting\"/>");