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

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

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

Modified Files:
	XHTMLSandUIServlet.java 
Log Message:
login and logout now support a "continue" parameter with a URL to redirect
to on completion. 


Index: XHTMLSandUIServlet.java
===================================================================
RCS file: /cvsroot/sandev/sand/platform/tools/src/org/sandev/tools/UIProcessor/XHTMLSandUIServlet.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** XHTMLSandUIServlet.java	15 Jun 2011 18:46:45 -0000	1.39
--- XHTMLSandUIServlet.java	24 Jun 2011 20:34:11 -0000	1.40
***************
*** 1060,1067 ****
          //out.println("</div>");
          out.println("");
!         if(!(getForgotPasswordPrimary().equals(""))) {  //supports forgot password
              out.println("<p id=\"forgotPasswordLink\">");
!             out.println("<a href=\"?" + XHTMLScreenAdaptor.SCREENPARAM + 
!                         "=forgotPassword\">forgot my password</a>");
              out.println("</p>"); }
          out.println("");
--- 1060,1069 ----
          //out.println("</div>");
          out.println("");
!         if(!(getForgotPasswordPrimary().equals(""))) {  //supports forgot pw
              out.println("<p id=\"forgotPasswordLink\">");
!             String fpl="?" + XHTMLScreenAdaptor.SCREENPARAM + "=forgotPassword";
!             if(StringUtil.haveValue(redirURL)) {
!                 fpl+="&amp;" + REDIRURL + "=" + redirURL; }
!             out.println("<a href=\"" + fpl + "\">forgot my password</a>");
              out.println("</p>"); }
          out.println("");
***************
*** 1086,1090 ****
          if(authID!=defaultAuthID) {
              writeRememberMeCookie(null,res); }
!         wrappedRedirect(res,rewriteURL(req,false,null));
          return null;
      }
--- 1088,1095 ----
          if(authID!=defaultAuthID) {
              writeRememberMeCookie(null,res); }
!         String redirURL=req.getParameter(REDIRURL);
!         if(!StringUtil.haveValue(redirURL)) {
!             redirURL=rewriteURL(req,false,null); }
!         wrappedRedirect(res,redirURL);
          return null;
      }
***************
*** 1110,1113 ****
--- 1115,1119 ----
          String primaryVal=req.getParameter(primary);
          String secondaryVal=req.getParameter(secondary);
+         String redirURL=req.getParameter(REDIRURL);
          if((primaryVal!=null)&&(!(primaryVal.trim().equals("")))) {
              String resultTxt="Your request could not be processed.";
***************
*** 1135,1138 ****
--- 1141,1147 ----
                  out.println("</code>");
                  out.println("<br class=\"fieldLineBreak\"/></span>"); }
+             if(StringUtil.haveValue(redirURL)) {
+                 out.println("<input type=\"hidden\" name=\"" + REDIRURL + 
+                             "\" " + "value=\"" + redirURL + "\"/>"); }
              out.println("<br class=\"SandUIDefaultFormatting\"/>");
              out.println("<br class=\"SandUIDefaultFormatting\"/>");
***************
*** 1152,1155 ****
--- 1161,1166 ----
              req,true,XHTMLScreenAdaptor.SCREENPARAM + "=login");
          out.println("  <p id=\"loginLinkPara\">");
+         if(StringUtil.haveValue(redirURL)) {
+             loginURL+="&amp;" + REDIRURL + "=" + redirURL; }
          out.println("    <a id=\"loginLink\" href=\"" + loginURL + "\">return to login screen</a>");
          out.println("  </p>");