Index: lams_central/web/lti/addLesson.jsp =================================================================== diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -rbdf65e9be3cdc4959bc3c047174acf3b269c96c8 --- lams_central/web/lti/addLesson.jsp (.../addLesson.jsp) (revision 4583983b64efe1d91fbb47cdde6a759a6a30e859) +++ lams_central/web/lti/addLesson.jsp (.../addLesson.jsp) (revision bdf65e9be3cdc4959bc3c047174acf3b269c96c8) @@ -188,22 +188,6 @@ function rettrim(stringToTrim) { return stringToTrim.replace(/^\s+|\s+$/g,""); } - - function receiveMessage(event) { - var lamsServerUrl = "${lams}"; - alert(""+lamsServerUrl.substring(0, event.origin.length) + "!" + event.origin +"!" +event.data); - - // verify the sender of this message - if ((lamsServerUrl.substring(0, event.origin.length) === event.origin) && (event.data == "refresh")) { - window.location.reload(); - } - } - - if (window.addEventListener){ - window.addEventListener("message", receiveMessage, false); - } else if (window.attachEvent){ - window.attachEvent("message", receiveMessage); - } Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java =================================================================== diff -u -ra94cb34efd3eb85a29b8488864a6ca7970d31dee -rbdf65e9be3cdc4959bc3c047174acf3b269c96c8 --- lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java (.../LoginRequestDispatcher.java) (revision a94cb34efd3eb85a29b8488864a6ca7970d31dee) +++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java (.../LoginRequestDispatcher.java) (revision bdf65e9be3cdc4959bc3c047174acf3b269c96c8) @@ -64,10 +64,6 @@ public static final String PARAM_IS_UPDATE_USER_DETAILS = "isUpdateUserDetails"; - public static final String PARAM_REQUEST_SRC = "requestSrc"; - - public static final String PARAM_IS_POST_MESSAGE_TO_PARENT = "isPostMessageToParent"; - public static final String PARAM_FIRST_NAME = "firstName"; public static final String PARAM_LAST_NAME = "lastName"; @@ -148,33 +144,18 @@ } /** AUTHOR * */ else if (METHOD_AUTHOR.equals(method)) { - String requestSrc = request.getParameter(PARAM_REQUEST_SRC); - String notifyCloseURL = request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL); - String isPostMessageToParent = request.getParameter(PARAM_IS_POST_MESSAGE_TO_PARENT); String ldID = request.getParameter(PARAM_LEARNING_DESIGN_ID); // Custom CSV string to be used for tool adapters String customCSV = request.getParameter(PARAM_CUSTOM_CSV); String extLmsId = request.getParameter(PARAM_SERVER_ID); - + + // append the extra parameters if they are present in the request String parameters = ""; + parameters = ldID != null ? parameters + "&learningDesignID" + "=" + ldID : parameters; + parameters = customCSV != null ? parameters + "&" + PARAM_CUSTOM_CSV + "=" + customCSV : parameters; + parameters = extLmsId != null ? parameters + "&" + PARAM_EXT_LMS_ID + "=" + extLmsId : parameters; - // append the extra parameters if they are present in the request - try { - parameters = ldID != null ? parameters + "&learningDesignID" + "=" + ldID : parameters; - parameters = customCSV != null ? parameters + "&" + PARAM_CUSTOM_CSV + "=" + customCSV : parameters; - parameters = extLmsId != null ? parameters + "&" + PARAM_EXT_LMS_ID + "=" + extLmsId : parameters; - parameters = requestSrc != null - ? parameters + "&" + PARAM_REQUEST_SRC + "=" + URLEncoder.encode(requestSrc, "UTF8") - : parameters; - parameters = notifyCloseURL != null ? parameters + "&" + AttributeNames.PARAM_NOTIFY_CLOSE_URL + "=" - + URLEncoder.encode(notifyCloseURL, "UTF8") : parameters; - parameters = isPostMessageToParent != null - ? parameters + "&" + PARAM_IS_POST_MESSAGE_TO_PARENT + "=" + isPostMessageToParent : parameters; - } catch (UnsupportedEncodingException e) { - log.error(e); - } - return request.getContextPath() + URL_AUTHOR + parameters; } /** MONITOR * */