Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java,v diff -u -r1.28 -r1.29 --- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java 5 Aug 2015 17:45:37 -0000 1.28 +++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java 29 Sep 2015 14:01:53 -0000 1.29 @@ -175,7 +175,14 @@ // but forward doesn't work, use this until a better method is found hses.setAttribute("extUser", login); hses.setAttribute(AttributeNames.USER, user.getUserDTO()); - response.sendRedirect("j_security_check?j_username=" + login + "&j_password=" + pass); + + // for NTU Blackboard's based templates, force to https to co-exist with Blackboard + String redirect = request.getParameter("redirectURL"); + if ( redirect != null && redirect.indexOf("ldtemplate") >= 0 ) { + response.sendRedirect("https://"+ request.getServerName() + ":" + request.getServerPort() + request.getContextPath() +"/j_security_check?j_username=" + login + "&j_password=" + pass); + } else { + response.sendRedirect("j_security_check?j_username=" + login + "&j_password=" + pass); + } } catch (AuthenticationException e) { LoginRequestServlet.log.error("Authentication error: ", e); response.sendError(HttpServletResponse.SC_UNAUTHORIZED, Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java,v diff -u -r1.20 -r1.21 --- lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java 14 May 2015 11:50:24 -0000 1.20 +++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java 29 Sep 2015 14:02:11 -0000 1.21 @@ -124,8 +124,14 @@ // get the location from an explicit parameter if it exists String redirect = request.getParameter("redirectURL"); - if ( redirect != null ) - return request.getContextPath() + "/" + redirect; + if ( redirect != null ) { + // for NTU Blackboard's based templates, force to https to co-exist with Blackboard + if ( redirect.indexOf("ldtemplate") >= 0 ) { + return "https://"+ request.getServerName() + ":" + request.getServerPort() + request.getContextPath() + "/" + redirect; + } else { + return request.getContextPath() + "/" + redirect; + } + } String method = request.getParameter(PARAM_METHOD); String lessonId = request.getParameter(PARAM_LESSON_ID);