Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_admin/web/import/importGroups.jsp
===================================================================
diff -u -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
+++ lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -46,7 +46,7 @@
 		UPLOAD_FILE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_MAX_SIZE}"/>';
 	
 		$(document).ready(function() {
-			initFileUpload('${importForm.tmpFileUploadId}', '${language}');
+			initFileUpload('<c:out value="${importForm.tmpFileUploadId}" />', '${language}');
 		});
 		
 		/**
Index: lams_admin/web/import/importexcel.jsp
===================================================================
diff -u -r9ab81eba5d1a95a6619094dfe12184f5580971e8 -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 9ab81eba5d1a95a6619094dfe12184f5580971e8)
+++ lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -45,7 +45,7 @@
 			UPLOAD_FILE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_MAX_SIZE}"/>';
 	
 			$(document).ready(function() {
-				initFileUpload('${importExcelForm.tmpFileUploadId}', '${language}');
+				initFileUpload('<c:out value="${importExcelForm.tmpFileUploadId}" />', '${language}');
 			});
 			
 			/**
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_central/web/authoringConfirm.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -12,14 +12,13 @@
 				window.parent.ActivityLib.closeActivityAuthoring(window.frameElement.id);
 				return;
 			}
-
-			var notifyCloseURL = "${param.notifyCloseURL}";
+			
+			var notifyCloseURL = "<c:out value='${param.notifyCloseURL}' />";
 			if (notifyCloseURL == "") {
 				refreshParentMonitoringWindow();
 			} else {
 				if (window.parent.opener == null
-						|| '${param.noopener}' == 'true'
-						|| notifyCloseURL.indexOf('noopener=true') >= 0) {
+						|| ${param.noopener eq "true" or param.notifyCloseURL.indexOf("noopener=true") >= 0}) {
 					window.location.href = notifyCloseURL + '&action=save';
 				} else {
 					window.parent.opener.location.href = notifyCloseURL;
Index: lams_central/web/qb/importQuestionsXml.jsp
===================================================================
diff -u -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_central/web/qb/importQuestionsXml.jsp	(.../importQuestionsXml.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
+++ lams_central/web/qb/importQuestionsXml.jsp	(.../importQuestionsXml.jsp)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -111,7 +111,7 @@
 		}
 		
 		$(document).ready(function(){
-			initFileUpload('${tmpFileUploadId}', '<lams:user property="localeLanguage"/>');
+			initFileUpload('<c:out value="${tmpFileUploadId}" />', '<lams:user property="localeLanguage"/>');
 		});	
 	</script>
 </lams:head>
@@ -129,7 +129,7 @@
 			<c:set var="csrfToken"><csrf:token/></c:set>
 			<form action="<c:url value="/xmlQuestions/importQuestionsXml.do"/>?${csrfToken}&collectionUid=${param.collectionUid}" method="post" 
 				id="importForm">	
-				<input type="hidden" name="tmpFileUploadId" value="${tmpFileUploadId}" /> 
+				<input type="hidden" name="tmpFileUploadId" value='<c:out value="${tmpFileUploadId}" />' /> 
 				
 			
 				<div id="image-upload-area" class="voffset20"></div>
Index: lams_central/web/questions/questionFile.jsp
===================================================================
diff -u -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
+++ lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -123,7 +123,7 @@
 		}
 		
 		$(document).ready(function(){
-			initFileUpload('${tmpFileUploadId}', '<lams:user property="localeLanguage"/>');
+			initFileUpload('<c:out value="${tmpFileUploadId}" />', '<lams:user property="localeLanguage"/>');
 		});	
 	</script>
 </lams:head>
Index: lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_learning/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_doku/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_doku/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_doku/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r36cf71acc82bfe6bc8409a8419617c82bd4f31c0 -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 36cf71acc82bfe6bc8409a8419617c82bd4f31c0)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
+++ lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_whiteboard/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_whiteboard/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_tool_zoom/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rcd28f26327e5afe5f9797847d801eba0abab9144 -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_tool_zoom/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
+++ lams_tool_zoom/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
Index: lams_www/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -rb77851c97d3c9d523c0beeb82d97449f2e9b0276
--- lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b77851c97d3c9d523c0beeb82d97449f2e9b0276)
@@ -97,15 +97,15 @@
     function closeWindow(nextAction) {
         // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
         // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		var notifyCloseURL = decodeURIComponent("<c:out value='${notifyCloseURL}' />");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
 			}
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+			if (${param.noopener eq "true" or notifyCloseURL.indexOf("noopener=true") >= 0}) {
 				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);