Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/summary.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_images/web/pages/monitoring/summary.jsp	27 Mar 2014 20:10:14 -0000	1.11
+++ lams_tool_images/web/pages/monitoring/summary.jsp	27 Mar 2014 21:14:34 -0000	1.12
@@ -24,13 +24,6 @@
 	window.onresize = resizeIframe;
 </script>
 
-<h1>
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
-
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.th.advancedSettings" />
-	</a>
-</h1>
 <br />
 
 <c:if test="${empty summaryList}">
@@ -191,6 +184,14 @@
 	</a>
 </div>
 
+
+<h1>
+	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+
+	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
+		<fmt:message key="monitor.summary.th.advancedSettings" />
+	</a>
+</h1>
 <div class="monitoring-advanced" id="advancedDiv" style="display:none">
 	<table class="alternative-color">
 		<tr>
Index: lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp	15 Aug 2013 20:20:28 -0000	1.5
+++ lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp	27 Mar 2014 21:12:58 -0000	1.6
@@ -23,7 +23,7 @@
 						<span class="field-name"> 
 							<fmt:message key="label.authoring.basic.resource.url" /> : 
 						</span>
-						${commonCartridge.title}
+						<c:out value="${commonCartridge.title}" escapeXml="true"/>
 					</td>
 					<td width="9%">
 						<a href="#"
@@ -52,7 +52,7 @@
 					<td>
 						<span class="field-name"> <fmt:message
 								key="label.authoring.basic.resource.file" /> : </span>
-						${commonCartridge.title}
+						<c:out value="${commonCartridge.title}" escapeXml="true"/>
 					</td>
 					<td>
 						<a href="#"
@@ -76,7 +76,7 @@
 					<td>
 						<span class="field-name"> <fmt:message
 								key="label.authoring.basic.resource.website" /> : </span>
-						${commonCartridge.title}
+						<c:out value="${commonCartridge.title}" escapeXml="true"/>
 					</td>
 					<td>
 						<a href="#"
@@ -99,7 +99,7 @@
 					<td>
 						<span class="field-name"> <fmt:message
 								key="label.authoring.basic.resource.learning.object" /> : </span>
-						${commonCartridge.title}
+						<c:out value="${commonCartridge.title}" escapeXml="true"/>
 					</td>
 					<td>
 						<a href="#"
Index: lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp	27 Jul 2013 07:53:30 -0000	1.4
+++ lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp	27 Mar 2014 21:12:58 -0000	1.5
@@ -51,7 +51,7 @@
 						<span class="field-name"> 
 							<fmt:message key="label.authoring.basic.resource.url" /> : 
 						</span>
-						${resource.title}
+						<c:out value="${resource.title}" escapeXml="true"/>
 						<br/>
 						
 						<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon${status.index}" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv${status.index}'), document.getElementById('treeIcon${status.index}'), '<lams:LAMSURL/>');" />
@@ -123,4 +123,4 @@
 
 	</div>	
 	</body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_imscc/web/pages/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/export/exportportfolio.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/pages/export/exportportfolio.jsp	28 May 2011 18:03:52 -0000	1.1
+++ lams_tool_imscc/web/pages/export/exportportfolio.jsp	27 Mar 2014 21:12:58 -0000	1.2
@@ -5,7 +5,9 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:set var="summaryList" value="${sessionMap.summaryList}" />
 <c:set var="mode" value="${sessionMap.mode}" />
-<c:set var="title" value="${sessionMap.title}" />
+<c:set var="title">
+	<c:out value="${sessionMap.title}" escapeXml="true"/>
+</c:set>
 <c:set var="instructions" value="${sessionMap.instructions}" />
 
 <lams:html>
@@ -43,7 +45,7 @@
 		</h1>
 		
 		<div>
-			${instructions}
+			<c:out value="${instructions}" escapeXml="false"/>
 		</div>
 
 		<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
@@ -123,7 +125,7 @@
 							</td>
 
 							<td>
-								${item.itemTitle}
+								<c:out value="${item.itemTitle}" escapeXml="true"/>
 							</td>
 
 							<td align="center">
@@ -169,7 +171,7 @@
 						value="${sessionMap.reflectList[group[0].sessionId]}" />
 					<c:forEach var="reflectDTO" items="${reflectDTOSet}">
 						<h4>
-							${reflectDTO.fullName}
+							<c:out value="${reflectDTO.fullName}" escapeXml="true"/>
 						</h4>
 						<p>
 							<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
Index: lams_tool_imscc/web/pages/itemreview/instructionsnav.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/itemreview/instructionsnav.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/pages/itemreview/instructionsnav.jsp	28 May 2011 18:03:39 -0000	1.1
+++ lams_tool_imscc/web/pages/itemreview/instructionsnav.jsp	27 Mar 2014 21:12:58 -0000	1.2
@@ -27,7 +27,7 @@
 
 <lams:html>
 	<lams:head>
-		<title>${instructions.title}</title>
+		<title><c:out value="${instructions.title}"/></title>
 
 		<%@ include file="/common/header.jsp"%>
 		
Index: lams_tool_imscc/web/pages/itemreview/openurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/itemreview/openurl.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/pages/itemreview/openurl.jsp	28 May 2011 18:03:39 -0000	1.1
+++ lams_tool_imscc/web/pages/itemreview/openurl.jsp	27 Mar 2014 21:12:58 -0000	1.2
@@ -9,7 +9,7 @@
 
 		<div id="content">
 			<p>
-				${title}
+				<c:out value="${title}" escapeXml="true"/>
 			</p>
 			<p>
 				<a href="javascript:;"
Index: lams_tool_imscc/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/learning/learning.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_imscc/web/pages/learning/learning.jsp	9 Apr 2013 12:46:55 -0000	1.3
+++ lams_tool_imscc/web/pages/learning/learning.jsp	27 Mar 2014 21:12:58 -0000	1.4
@@ -47,11 +47,11 @@
 
 	<div id="content">
 		<h1>
-			${commonCartridge.title}
+			<c:out value="${commonCartridge.title}" escapeXml="true"/>
 		</h1>
 
 		<p>
-			${commonCartridge.instructions}
+			<c:out value="${commonCartridge.instructions}" escapeXml="false"/>
 		</p>
 
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
@@ -81,7 +81,7 @@
 			<c:forEach var="item" items="${sessionMap.commonCartridgeList}">
 				<tr>
 					<td>
-						<a href="#" onclick="viewItem(${item.uid})"> ${item.title} </a>
+						<a href="#" onclick="viewItem(${item.uid})"> <c:out value="${item.title}"/> </a>
 					</td>
 					<td align="center">
 						<c:choose>
@@ -108,7 +108,7 @@
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
 				<h2>
-					${sessionMap.reflectInstructions}
+					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 				</h2>
 
 				<c:choose>
Index: lams_tool_imscc/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/learning/notebook.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_imscc/web/pages/learning/notebook.jsp	9 Apr 2013 12:46:56 -0000	1.3
+++ lams_tool_imscc/web/pages/learning/notebook.jsp	27 Mar 2014 21:12:58 -0000	1.4
@@ -29,13 +29,13 @@
 
 		<div id="content">
 			<h1>
-				${sessionMap.title}
+				<c:out value="${sessionMap.title}" escapeXml="true"/>
 			</h1>
 
 			<%@ include file="/common/messages.jsp"%>
 
 			<p>
-				<lams:out value="${sessionMap.reflectInstructions}" />
+				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 			</p>
 
 			<html:textarea cols="60" rows="8" property="entryText"
Index: lams_tool_imscc/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/pages/monitoring/editactivity.jsp	28 May 2011 18:03:35 -0000	1.1
+++ lams_tool_imscc/web/pages/monitoring/editactivity.jsp	27 Mar 2014 21:12:58 -0000	1.2
@@ -15,7 +15,7 @@
 			:
 		</td>
 		<td>
-			<c:out value="${commonCartridge.title}" escapeXml="false" />
+			<c:out value="${commonCartridge.title}" escapeXml="true" />
 		</td>
 	</tr>
 
Index: lams_tool_imscc/web/pages/monitoring/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/monitoring/notebook.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/pages/monitoring/notebook.jsp	28 May 2011 18:03:35 -0000	1.1
+++ lams_tool_imscc/web/pages/monitoring/notebook.jsp	27 Mar 2014 21:12:58 -0000	1.2
@@ -13,18 +13,18 @@
 				<h1>
 					<fmt:message key="page.title.monitoring.view.reflection"/>
 				</h1>
-				${userDTO.fullName}<BR><BR>
+				<c:out value="${userDTO.fullName}" escapeXml="true"/><BR><BR>
 				<table class="alternative-color" cellspacing="0">
 					<tr>
 						<th class="first">
-							<lams:out value="${userDTO.reflectInstrctions}"/>
+							<lams:out value="${userDTO.reflectInstrctions}" escapeHtml="true"/>
 						</th>
 					</tr>
 					<tr>
 						<td>
 							<c:choose>
 								<c:when test="${userDTO.finishReflection}">
-									<lams:out value="${userDTO.reflect}"/>
+									<lams:out value="${userDTO.reflect}" escapeHtml="true"/>
 								</c:when>
 								<c:otherwise>
 									<fmt:message key="message.no.reflection.available" />
Index: lams_tool_imscc/web/pages/monitoring/statistic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/monitoring/statistic.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/pages/monitoring/statistic.jsp	28 May 2011 18:03:35 -0000	1.1
+++ lams_tool_imscc/web/pages/monitoring/statistic.jsp	27 Mar 2014 21:12:58 -0000	1.2
@@ -61,7 +61,7 @@
 						</c:choose>
 					</td>
 					<td>
-						${item.itemTitle}
+						<c:out value="${item.itemTitle}" escapeXml="true"/>
 					</td>
 					<td align="center">
 						<c:choose>
Index: lams_tool_imscc/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/monitoring/summary.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/pages/monitoring/summary.jsp	28 May 2011 18:03:35 -0000	1.1
+++ lams_tool_imscc/web/pages/monitoring/summary.jsp	27 Mar 2014 21:12:58 -0000	1.2
@@ -3,96 +3,8 @@
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
-<h1>
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
-
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.th.advancedSettings" />
-	</a>
-</h1>
 <br />
 
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-<table class="alternative-color">
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.lock.on.finished" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.commonCartridge.lockWhenFinished == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.run.content.auto" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.commonCartridge.runAuto == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.mini.number.resources.view" />
-		</td>
-		
-		<td>
-			${sessionMap.commonCartridge.miniViewCommonCartridgeNumber}
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="monitor.summary.td.addNotebook" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.commonCartridge.reflectOnActivity == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<c:choose>
-		<c:when test="${sessionMap.commonCartridge.reflectOnActivity == true}">
-			<tr>
-				<td>
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</td>
-				<td>
-					${sessionMap.commonCartridge.reflectInstructions}	
-				</td>
-			</tr>
-		</c:when>
-	</c:choose>
-</table>
-</div>
-
-
-
-
 <c:if test="${empty summaryList}">
 	<div align="center">
 		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
@@ -159,15 +71,15 @@
 						</c:choose>
 					</td>
 					<td>
-						<a href="javascript:;" onclick="viewItem(${item.itemUid},'${sessionMapID}')">${item.itemTitle}</a>
+						<a href="javascript:;" onclick="viewItem(${item.itemUid},'${sessionMapID}')"><c:out value="${item.itemTitle}" escapeXml="true"/></a>
 					</td>
 					<td align="center">
 						<c:choose>
 							<c:when test="${item.viewNumber > 0}">
 								<c:set var="listUrl">
 									<c:url value='/monitoring/listuser.do?toolSessionID=${item.sessionId}&itemUid=${item.itemUid}' />
 								</c:set>
-								<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
+								<a href="#" onclick="launchPopup('${listUrl}','listuser')"> <c:out value="${item.viewNumber}" escapeXml="true"/><a>
 							</c:when>
 							<c:otherwise>
 									0
@@ -201,21 +113,15 @@
 								<th colspan="2">
 									<fmt:message key="monitoring.user.fullname"/>
 								</th>
-								<th colspan="2">
-									<fmt:message key="monitoring.label.user.loginname"/>
-								</th>
 								<th>
 									<fmt:message key="monitoring.user.reflection"/>
 								</th>
 							</tr>
 						</c:if>
 						<tr>
 							<td colspan="2">
-								${user.fullName}
+								<c:out value="${user.fullName}" escapeXml="true"/>
 							</td>
-							<td colspan="2">
-								${user.loginName}
-							</td>
 							<td >
 								<c:set var="viewReflection">
 									<c:url value="/monitoring/viewReflection.do?toolSessionID=${item.sessionId}&userUid=${user.userUid}"/>
@@ -232,3 +138,91 @@
 		
 	</c:forEach>
 </table>
+
+
+
+<h1>
+	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+
+	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
+		<fmt:message key="monitor.summary.th.advancedSettings" />
+	</a>
+</h1>
+
+<div class="monitoring-advanced" id="advancedDiv" style="display:none">
+<table class="alternative-color">
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advance.lock.on.finished" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.commonCartridge.lockWhenFinished == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advance.run.content.auto" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.commonCartridge.runAuto == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advance.mini.number.resources.view" />
+		</td>
+		
+		<td>
+			${sessionMap.commonCartridge.miniViewCommonCartridgeNumber}
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="monitor.summary.td.addNotebook" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.commonCartridge.reflectOnActivity == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<c:choose>
+		<c:when test="${sessionMap.commonCartridge.reflectOnActivity == true}">
+			<tr>
+				<td>
+					<fmt:message key="monitor.summary.td.notebookInstructions" />
+				</td>
+				<td>
+					<lams:out value="${sessionMap.commonCartridge.reflectInstructions}" escapeHtml="true"/>
+				</td>
+			</tr>
+		</c:when>
+	</c:choose>
+</table>
+</div>
Index: lams_tool_imscc/web/pages/monitoring/userlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/monitoring/userlist.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/pages/monitoring/userlist.jsp	28 May 2011 18:03:35 -0000	1.1
+++ lams_tool_imscc/web/pages/monitoring/userlist.jsp	27 Mar 2014 21:12:58 -0000	1.2
@@ -19,9 +19,6 @@
 	<table border="0" cellspacing="3" width="98%">
 		<tr>
 			<th>
-				<fmt:message key="monitoring.label.user.loginname" />
-			</th>
-			<th>
 				<fmt:message key="monitoring.label.access.time" />
 			</th>
 			<th>
@@ -31,13 +28,10 @@
 		<c:forEach var="user" items="${userList}">
 			<tr>
 				<td>
-					${user.loginName}
-				</td>
-				<td>
 					<lams:Date value="${user.accessDate}"/>
 				</td>
 				<td>
-					${user.firstName},${user.lastName}
+					<c:out value="${user.firstName},${user.lastName}" escapeXml="true"/>
 				</td>
 			</tr>
 		</c:forEach>