Index: lams_tool_eadventure/web/pages/authoring/parts/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/authoring/parts/itemlist.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_eadventure/web/pages/authoring/parts/itemlist.jsp	15 Aug 2013 20:20:26 -0000	1.6
+++ lams_tool_eadventure/web/pages/authoring/parts/itemlist.jsp	27 Mar 2014 14:34:08 -0000	1.7
@@ -16,7 +16,7 @@
 			<tr>
 					<td>
 						<span class="field-name"> eAdventure: </span>
-						${eadventure.title}
+						<c:out value="${eadventure.title}" escapeXml="true"/>
 					</td>
 					<td>
 						<a href="#"
Index: lams_tool_eadventure/web/pages/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/export/exportportfolio.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/pages/export/exportportfolio.jsp	11 Dec 2011 21:30:39 -0000	1.3
+++ lams_tool_eadventure/web/pages/export/exportportfolio.jsp	27 Mar 2014 14:34:08 -0000	1.4
@@ -39,7 +39,7 @@
 	<div id="content">
 
 		<h1>
-			${title}
+			<c:out value="${title}" escapeXml="true"/>
 		</h1>
 		
 		<div style="height:40px">
@@ -50,7 +50,7 @@
 		
 		
 		<div style="height:40px">
-			${instructions}
+			<c:out value="${instructions}" escapeXml="false"/>
 		</div>
 
 		<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
@@ -64,11 +64,6 @@
 			
 		<c:forEach var="user" items="${group.users}" varStatus="status" >
 			<tr>
-				
-			<th>
-				<fmt:message key="monitoring.label.user.loginname" />
-			</th>
-			<th> 
 				<fmt:message key="monitoring.label.access.time" />
 			</th> 
 			<th>
@@ -78,13 +73,10 @@
 		</tr>
 			<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>	
 				
 	
@@ -128,7 +120,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_eadventure/web/pages/itemreview/instructionsnav.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/itemreview/instructionsnav.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/pages/itemreview/instructionsnav.jsp	11 Dec 2011 21:30:39 -0000	1.3
+++ lams_tool_eadventure/web/pages/itemreview/instructionsnav.jsp	27 Mar 2014 14:34:08 -0000	1.4
@@ -40,7 +40,7 @@
 
 <lams:html>
 	<lams:head>
-		<title>${instructions.title}</title>
+		<title><c:out value="${instructions.title}" escapeXml="true"/></title>
 
 		<%@ include file="/common/header.jsp"%>
 		
@@ -161,7 +161,7 @@
 						<fmt:message key="msg.no.instruction" />
 					</c:when>
 					<c:otherwise>
-					${instructions.instruction}
+					<c:out value="${instructions.instruction}" escapeXml="false"/>
 				</c:otherwise>
 				</c:choose>
 			</p>
Index: lams_tool_eadventure/web/pages/itemreview/openurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/itemreview/openurl.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/pages/itemreview/openurl.jsp	11 Dec 2011 21:30:40 -0000	1.3
+++ lams_tool_eadventure/web/pages/itemreview/openurl.jsp	27 Mar 2014 14:34:08 -0000	1.4
@@ -9,7 +9,7 @@
 
 		<div id="content">
 			<p>
-				${title}
+				<c:out value="${title}" escapeXml="true"/>
 			</p>
 			<p>
 				<a href="javascript:;"
Index: lams_tool_eadventure/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/learning/learning.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_eadventure/web/pages/learning/learning.jsp	9 Apr 2013 12:46:18 -0000	1.5
+++ lams_tool_eadventure/web/pages/learning/learning.jsp	27 Mar 2014 14:34:08 -0000	1.6
@@ -71,11 +71,11 @@
 
 	<div id="content">
 		<h1>
-			${eadventure.title}
+			<c:out value="${eadventure.title}" escapeXml="true"/>
 		</h1>
 
 		<p>
-			${eadventure.instructions}
+			<c:out value="${eadventure.instructions}" escapeXml="false"/>
 		</p>
 
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
@@ -107,7 +107,7 @@
 				<tr>
 					<td>
 						<a href="#" onclick="viewItem(${eadventure.contentId})">
-							${eadventure.title} </a>
+							<c:out value="${eadventure.title}" escapeXml="true"/> </a>
 						
 						
 					</td>
@@ -132,7 +132,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_eadventure/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/learning/notebook.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_eadventure/web/pages/learning/notebook.jsp	9 Apr 2013 12:46:18 -0000	1.5
+++ lams_tool_eadventure/web/pages/learning/notebook.jsp	27 Mar 2014 14:34:08 -0000	1.6
@@ -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_eadventure/web/pages/learningobj/navigatortree.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/learningobj/navigatortree.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_eadventure/web/pages/learningobj/navigatortree.jsp	15 Feb 2013 11:05:21 -0000	1.4
+++ lams_tool_eadventure/web/pages/learningobj/navigatortree.jsp	27 Mar 2014 14:34:08 -0000	1.5
@@ -90,7 +90,7 @@
 		</c:when>
 		<c:otherwise>
 			<h2>
-				<c:out value="${cpPackage.title}" />
+				<c:out value="${cpPackage.title}" escapeXml="true"/>
 			</h2>
 			<BR><BR>
 			<script language="JavaScript">
Index: lams_tool_eadventure/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/monitoring/summary.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/pages/monitoring/summary.jsp	11 Dec 2011 21:30:43 -0000	1.3
+++ lams_tool_eadventure/web/pages/monitoring/summary.jsp	27 Mar 2014 14:34:08 -0000	1.4
@@ -77,7 +77,7 @@
 					<fmt:message key="monitor.summary.td.notebookInstructions" />
 				</td>
 				<td>
-					${sessionMap.eadventure.reflectInstructions}	
+					<lams:out value="${sessionMap.eadventure.reflectInstructions}" escapeHtml="true"/>
 				</td>
 			</tr>
 		</c:when>
Index: lams_tool_eadventure/web/pages/monitoring/userlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/monitoring/userlist.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/pages/monitoring/userlist.jsp	11 Dec 2011 21:30:43 -0000	1.3
+++ lams_tool_eadventure/web/pages/monitoring/userlist.jsp	27 Mar 2014 14:34:08 -0000	1.4
@@ -10,10 +10,6 @@
 				</tr>
 			
 			<tr>
-				
-			<th>
-				<fmt:message key="monitoring.label.user.loginname" />
-			</th>
 			<th> 
 				<fmt:message key="monitoring.label.access.time" />
 			</th> 
@@ -25,13 +21,10 @@
 		<c:forEach var="user" items="${group.users}" varStatus="status" >
 			<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>	
 				
 				<c:choose>
@@ -61,21 +54,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">
-								${userRef.fullName}
+								<c:out value="${userRef.fullName}" escapeXml="true"/>
 							</td>
-							<td colspan="2">
-								${userRef.loginName}
-							</td>
 							<td >
 								<c:set var="viewReflection">
 									<c:url value="/monitoring/viewReflection.do?toolSessionID=${group.sessionId}&userUid=${userRef.userUid}"/>
Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/export/exportportfolio.jsp,v
diff -u -r1.29 -r1.30
--- lams_tool_forum/web/jsps/export/exportportfolio.jsp	26 Mar 2014 23:27:40 -0000	1.29
+++ lams_tool_forum/web/jsps/export/exportportfolio.jsp	27 Mar 2014 14:40:28 -0000	1.30
@@ -149,7 +149,7 @@
 			<c:if test="${userDTOSet ne null}">
 				<h3><fmt:message key="label.export.reflection" /></h3>
 				<c:forEach var="userDTO" items="${userDTOSet}">
-					<h4>${userDTO.fullName}</h4>
+					<h4><c:out value="${userDTO.fullName}" escapeXml="true"/></h4>
 					<p>
 						<lams:out value="${userDTO.reflect}" escapeHtml="true" /> 
 					</p>	
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/viewforum.jsp,v
diff -u -r1.41 -r1.42
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	26 Mar 2014 23:40:45 -0000	1.41
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	27 Mar 2014 14:40:28 -0000	1.42
@@ -137,7 +137,7 @@
 	<c:if test="${sessionMap.userFinished and sessionMap.reflectOn and !sessionMap.hideReflection}">
 		<div class="small-space-top">
 			<h2>
-				<c:out value="${sessionMap.reflectInstructions}" escapeXml="true"/>
+				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 			</h2>
 
 			<c:choose>
Index: lams_tool_forum/web/jsps/learning/mobile/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/mobile/notebook.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/learning/mobile/notebook.jsp	26 Mar 2014 23:40:45 -0000	1.6
+++ lams_tool_forum/web/jsps/learning/mobile/notebook.jsp	27 Mar 2014 14:40:28 -0000	1.7
@@ -28,7 +28,7 @@
 		<%@ include file="/common/messages.jsp"%>
 
 		<p>
-			<c:out value="${sessionMap.reflectInstructions}" escapeXml="true"/>
+			<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 		</p>
 
 		<html:textarea cols="52" rows="6" property="entryText"
Index: lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp	26 Mar 2014 23:40:45 -0000	1.8
+++ lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp	27 Mar 2014 14:40:28 -0000	1.9
@@ -134,7 +134,7 @@
 			<c:if test="${sessionMap.userFinished and sessionMap.reflectOn and !sessionMap.hideReflection}">
 				<div class="small-space-top">
 					<h2>
-						<c:out value="${sessionMap.reflectInstructions}" escapeXml="true" />
+						<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 					</h2>
 		
 					<c:choose>
Index: lams_tool_forum/web/jsps/monitoring/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/notebook.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/web/jsps/monitoring/notebook.jsp	9 Nov 2006 05:36:44 -0000	1.4
+++ lams_tool_forum/web/jsps/monitoring/notebook.jsp	27 Mar 2014 14:40:28 -0000	1.5
@@ -5,14 +5,14 @@
 <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.not.avaliable" />
Index: lams_tool_forum/web/jsps/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/summary.jsp,v
diff -u -r1.26 -r1.27
--- lams_tool_forum/web/jsps/monitoring/summary.jsp	26 Mar 2014 23:40:46 -0000	1.26
+++ lams_tool_forum/web/jsps/monitoring/summary.jsp	27 Mar 2014 14:40:28 -0000	1.27
@@ -322,7 +322,7 @@
 					<fmt:message key="monitor.summary.td.notebookInstructions" />
 				</td>
 				<td>
-					<c:out value="${forum.reflectInstructions}" escapeXml="true" />
+					<lams:out value="${forum.reflectInstructions}" escapeHtml="true" />
 				</td>
 			</tr>
 		</c:when>
@@ -361,9 +361,6 @@
 					<th>
 						<fmt:message key="monitoring.user.fullname"/>
 					</th>
-					<th>
-						<fmt:message key="monitoring.user.loginname"/>
-					</th>
 					<c:if test="${user.hasRefection}">
 						<th>
 							<fmt:message key="monitoring.user.reflection"/>
@@ -377,11 +374,8 @@
 			</c:if>
 			<tr>
 				<td>
-					<c:out value="${user.fullName}" />
+					<c:out value="${user.fullName}" escapeXml="true" />
 				</td>
-				<td>
-					<c:out value="${user.loginName}" />
-				</td>
 				<c:if test="${user.hasRefection}">
 				<td>
 						<c:set var="viewReflection">