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

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

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

Modified Files:
	XHTMLSandUIServlet.java 
Log Message:
Since initiating a session while in https no longer seems to survive a
redirect back to plain http, write the rememberme cookie to enable login
after hitting a nonsecure continue url.


Index: XHTMLSandUIServlet.java
===================================================================
RCS file: /cvsroot/sandev/sand/platform/tools/src/org/sandev/tools/UIProcessor/XHTMLSandUIServlet.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** XHTMLSandUIServlet.java	24 Jun 2011 20:34:11 -0000	1.40
--- XHTMLSandUIServlet.java	23 Nov 2011 21:56:13 -0000	1.41
***************
*** 961,964 ****
--- 961,965 ----
          String username=req.getParameter("username");
          String password=req.getParameter("password");
+         String redirURL=req.getParameter(REDIRURL);
          if(StringUtil.haveValue(username)) {
              AuthUser user=null;
***************
*** 969,975 ****
                  debugout("    session: " + session.getId());
                  String rememberme=req.getParameter("rememberme");
!                 if((rememberme!=null)&&(!rememberme.equals(""))) {
                      writeRememberMeCookie(user,res); }
-                 String redirURL=req.getParameter(REDIRURL);
                  if(!StringUtil.haveValue(redirURL)) {
                      redirURL=rewriteURL(req,
--- 970,977 ----
                  debugout("    session: " + session.getId());
                  String rememberme=req.getParameter("rememberme");
!                 if(((rememberme!=null)&&(!rememberme.equals("")))||
!                    ((StringUtil.haveValue(redirURL))&&    //session won't 
!                     (redirURL.startsWith("http://")))) {  //survive mode switch
                      writeRememberMeCookie(user,res); }
                  if(!StringUtil.haveValue(redirURL)) {
                      redirURL=rewriteURL(req,