Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java =================================================================== diff -u -re2f69f4a65dbffb092b05c33ccde15ebe75f3a3f -r0117279b4c4d0ad5da7135ddb92592ecc02d6453 --- lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java (.../LoginRequestDispatcher.java) (revision e2f69f4a65dbffb092b05c33ccde15ebe75f3a3f) +++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java (.../LoginRequestDispatcher.java) (revision 0117279b4c4d0ad5da7135ddb92592ecc02d6453) @@ -124,24 +124,18 @@ String parameters = ""; - if (customCSV != null && extLmsId != null) { - parameters += "&" + PARAM_CUSTOM_CSV + "=" + customCSV; - parameters += "&" + PARAM_EXT_LMS_ID + "=" + extLmsId; - } else { - log.error("Parameter customCSV not present"); + // append the extra parameters if they are present in the request + try { + 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 + "&" + PARAM_NOTIFY_CLOSE_URL + "=" + + URLEncoder.encode(notifyCloseURL, "UTF8") : parameters; + } catch (UnsupportedEncodingException e) { + log.error(e); } - if (requestSrc != null && notifyCloseURL != null) { - try { - parameters = "&" + PARAM_REQUEST_SRC + "=" + URLEncoder.encode(requestSrc, "UTF8"); - parameters += "&" + PARAM_NOTIFY_CLOSE_URL + "=" + URLEncoder.encode(notifyCloseURL, "UTF8"); - } catch (UnsupportedEncodingException e) { - log.error(e); - } - } else { - log.error("Parameters 'requestSrc' and 'notifyCloseURL' are not present"); - } - return request.getContextPath() + URL_AUTHOR + parameters; } /** MONITOR * */