Index: lams_tool_task/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -rc2ba0dc3e2d99441897de8d185e83c419a416f2d -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
+++ lams_tool_task/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -23,7 +23,7 @@
 					<fmt:message key="label.authoring.basic.resource.task" />
 				</td>
                                 <td>
-					${taskList.title}
+					<c:out value="${taskList.title}" escapeXml="true"/>
 				</td>
 
 				<td width="40px" align="center">
Index: lams_tool_task/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -rf385194bf2584414427c60c9f0fe6c7ca5993bc6 -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision f385194bf2584414427c60c9f0fe6c7ca5993bc6)
+++ lams_tool_task/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -20,7 +20,7 @@
 
 	<div id="content">
 
-		<h1>${title} </h1>
+		<h1><c:out value="${title}" escapeXml="true"/></h1>
 
 		<table border="0" cellspacing="3" width="98%">
 			<c:forEach var="itemSummary" items="${itemSummaryList}">
Index: lams_tool_task/web/pages/export/itemsummary.jsp
===================================================================
diff -u -r3f118a66718ff89ec94041602e7e60db6ee06722 -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/export/itemsummary.jsp	(.../itemsummary.jsp)	(revision 3f118a66718ff89ec94041602e7e60db6ee06722)
+++ lams_tool_task/web/pages/export/itemsummary.jsp	(.../itemsummary.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -83,7 +83,7 @@
 					
 			<tr>
 				<td>
-					${visitLogSummary.user.loginName}
+					<c:out value="${visitLogSummary.user.loginName}" escapeXml="true"/>
 				</td>
 							
 				<td align="center">
@@ -107,7 +107,7 @@
 						<ul>
 							<c:forEach var="comment" items="${visitLogSummary.comments}">
 								<li>
-									<c:out value="${comment.comment}" escapeXml="false"></c:out>
+									<c:out value="${comment.comment}" escapeXml="true"></c:out>
 								</li>
 							</c:forEach>
 										
@@ -137,7 +137,7 @@
 		<c:forEach var="visitLogSummary" items="${groupSummary.taskListItemVisitLogSummaries}">
 			<c:set var="reflectDTO" value="${visitLogSummary.reflectDTO}" />
 			<h4>
-				${reflectDTO.fullName}
+				<c:out value="${reflectDTO.fullName}" escapeXml="true"/>
 			</h4>
 			<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
 		</c:forEach>
Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -81,7 +81,7 @@
 		<!--Task Information-->
 	
 		<h1>
-			${taskList.title}
+			<c:out value="${taskList.title}" escapeXml="true"/>
 		</h1>
 		
  	   	<%@ include file="/common/messages.jsp"%>
@@ -96,7 +96,7 @@
 		
 
 		<p>
-			${taskList.instructions}
+			<c:out value="${taskList.instructions}" escapeXml="false"/>
 		</p>
 		
 		<c:if test="${(mode != 'teacher') && taskList.lockWhenFinished}">
@@ -161,7 +161,7 @@
 		
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
-				<h2>${sessionMap.reflectInstructions}</h2>
+				<h2><lams:out escapeHtml="true" value="${sessionMap.reflectInstructions}"/></h2>
 			
 				<c:choose>
 					<c:when test="${empty sessionMap.reflectEntry}">
Index: lams_tool_task/web/pages/learning/parts/filelist.jsp
===================================================================
diff -u -r5d4c7c430b9dd0fc2247d9e5fa5babbac5fb4571 -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/learning/parts/filelist.jsp	(.../filelist.jsp)	(revision 5d4c7c430b9dd0fc2247d9e5fa5babbac5fb4571)
+++ lams_tool_task/web/pages/learning/parts/filelist.jsp	(.../filelist.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -13,10 +13,10 @@
 			<c:if test="${item.showCommentsToAll || (sessionMap.userLogin == file.createBy.loginName) || (sessionMap.mode == 'teacher') || (sessionMap.mode == 'author')}">
 			
 				<li>
-					<c:out value="${file.fileName}" />
+					<c:out value="${file.fileName}" escapeXml="true"/>
 												
 					<c:if test="${file.createBy != null}">
-						[${file.createBy.loginName}]
+						[<c:out value="${file.createBy.loginName}" escapeXml="true"/>]
 					</c:if>
 													
 					<c:set var="downloadURL">
Index: lams_tool_task/web/pages/learning/parts/itemlist.jsp
===================================================================
diff -u -r883c4cc054a636dc8017da1b244b89bdaf0ff974 -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 883c4cc054a636dc8017da1b244b89bdaf0ff974)
+++ lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -74,9 +74,9 @@
 						</c:otherwise>
 					</c:choose>
 										
-						${item.title} 
+						<c:out value="${item.title}" escapeXml="true"/>
 						<c:if test="${!item.createByAuthor && item.createBy != null}">
-								[${item.createBy.loginName}]
+								[<c:out value="${item.createBy.loginName}" escapeXml="true"/>]
 						</c:if>
 						<c:if test="${item.required}">
 							*
Index: lams_tool_task/web/pages/learning/parts/notebook.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -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_task/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 875f56cb6917d1a52bed0545f2933c3b55497a02)
+++ lams_tool_task/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -15,7 +15,7 @@
 			:
 		</td>
 		<td>
-			<c:out value="${taskList.title}" escapeXml="false" />
+			<c:out value="${taskList.title}" escapeXml="true" />
 		</td>
 	</tr>
 
Index: lams_tool_task/web/pages/monitoring/itemsummary.jsp
===================================================================
diff -u -r0d23815a0217cc440544b56c2a964cef24d7de50 -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision 0d23815a0217cc440544b56c2a964cef24d7de50)
+++ lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -104,7 +104,7 @@
 					
 						<tr>
 							<td>
-								${visitLogSummary.user.loginName}
+								<c:out value="${visitLogSummary.user.loginName}" escapeXml="true"/>
 							</td>
 							
 							<td align="center">
@@ -129,7 +129,7 @@
 									<ul>
 										<c:forEach var="comment" items="${visitLogSummary.comments}">
 											<li>
-												<c:out value="${comment.comment}"></c:out>
+												<c:out value="${comment.comment}" escapeXml="false"/>
 											</li>
 										</c:forEach>
 										
Index: lams_tool_task/web/pages/monitoring/parts/notebook.jsp
===================================================================
diff -u -r341a816804f6b2b61a5f180479b56d8fd0d1ea29 -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/monitoring/parts/notebook.jsp	(.../notebook.jsp)	(revision 341a816804f6b2b61a5f180479b56d8fd0d1ea29)
+++ lams_tool_task/web/pages/monitoring/parts/notebook.jsp	(.../notebook.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -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_task/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -r0d23815a0217cc440544b56c2a964cef24d7de50 -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 0d23815a0217cc440544b56c2a964cef24d7de50)
+++ lams_tool_task/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -41,10 +41,10 @@
 			<c:if test="${item.uid != -1}">
 				<tr>
 					<td>
-						${item.title}
+						<c:out value="${item.title}" escapeXml="true"/>
 					</td>
 					<td>
-						${item.createBy.loginName}
+						<c:out value="${item.createBy.loginName}" escapeXml="true"/>
 					</td>
 					<td align="center">
 						${summary.visitNumbers[status.index]}
Index: lams_tool_task/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_task/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -41,119 +41,12 @@
 -->	
 </script>
 
-<%-- Overall TaskList information  --%>
-<h1 style="padding-bottom: 10px;">
-	<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>
+	<c:out value="${taskList.title}" escapeXml="true"/>
 </h1>
-<br />
-
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-<table class="alternative-color">
-
-	<tr>
-		<td>
-			<fmt:message key="label.monitoring.summary.lock.when.finished" ><fmt:param> </fmt:param></fmt:message>
-		</td>
-		<td>
-			<c:choose>
-				<c:when test="${taskList.lockWhenFinished}">
-					<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.monitoring.summary.sequential.order" ><fmt:param> </fmt:param></fmt:message>
-		</td>
-		<td>
-			<c:choose>
-				<c:when test="${taskList.sequentialOrder}">
-					<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.monitoring.summary.min.number.tasks" ><fmt:param> </fmt:param></fmt:message>
-		</td>
-		<td>
-			<c:choose>
-				<c:when test="${taskList.minimumNumberTasks > 0}">
-					${taskList.minimumNumberTasks}
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.monitoring.summary.allowed.contribute.tasks" ><fmt:param> </fmt:param></fmt:message>
-		</td>
-		<td>
-			<c:choose>
-				<c:when test="${taskList.allowContributeTasks}">
-					<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.monitoring.summary.monitor.verification" ><fmt:param> </fmt:param></fmt:message>
-		</td>
-		<td>
-			<c:choose>
-				<c:when test="${taskList.monitorVerificationRequired}">
-					<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.monitoring.summary.notebook.reflection" ><fmt:param> </fmt:param></fmt:message>
-		</td>
-		<td>
-			<c:choose>
-				<c:when test="${taskList.reflectOnActivity}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-</table>
+<div class="instructions space-top space-bottom">
+	<c:out value="${taskList.instructions}" escapeXml="false"/>
 </div>
-
-<%@include file="daterestriction.jsp"%>
-
 <%-- Summary list  --%>
 
 <c:if test="${empty summaryList}">
@@ -175,7 +68,7 @@
 			<c:forEach var="item" items="${summary.taskListItems}">
 				<th width="30px"  align="center" style="background-repeat: repeat">
 					<a href="javascript:;" onclick="return summaryTask(${item.uid})"> 
-						${item.title} 
+						<c:out value="${item.title}" escapeXml="true"/> 
 					</a>
 				</th>
 			</c:forEach>					
@@ -269,3 +162,118 @@
 	
 </c:forEach>				
 				
+				
+<br/>				
+<%-- Overall TaskList information  --%>
+<h1 style="padding-bottom: 10px;">
+	<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.monitoring.summary.lock.when.finished" ><fmt:param> </fmt:param></fmt:message>
+		</td>
+		<td>
+			<c:choose>
+				<c:when test="${taskList.lockWhenFinished}">
+					<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.monitoring.summary.sequential.order" ><fmt:param> </fmt:param></fmt:message>
+		</td>
+		<td>
+			<c:choose>
+				<c:when test="${taskList.sequentialOrder}">
+					<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.monitoring.summary.min.number.tasks" ><fmt:param> </fmt:param></fmt:message>
+		</td>
+		<td>
+			<c:choose>
+				<c:when test="${taskList.minimumNumberTasks > 0}">
+					${taskList.minimumNumberTasks}
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="label.monitoring.summary.allowed.contribute.tasks" ><fmt:param> </fmt:param></fmt:message>
+		</td>
+		<td>
+			<c:choose>
+				<c:when test="${taskList.allowContributeTasks}">
+					<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.monitoring.summary.monitor.verification" ><fmt:param> </fmt:param></fmt:message>
+		</td>
+		<td>
+			<c:choose>
+				<c:when test="${taskList.monitorVerificationRequired}">
+					<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.monitoring.summary.notebook.reflection" ><fmt:param> </fmt:param></fmt:message>
+		</td>
+		<td>
+			<c:choose>
+				<c:when test="${taskList.reflectOnActivity}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+</table>
+</div>
+
+<%@include file="daterestriction.jsp"%>
+				
\ No newline at end of file
Index: lams_tool_task/web/pages/monitoring/userlist.jsp
===================================================================
diff -u -r182743b20b3ea04f99193cdce3a176f04d055641 -re9bdb37e387bfd27e3e0a7a3c055a5aff96d8843
--- lams_tool_task/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision 182743b20b3ea04f99193cdce3a176f04d055641)
+++ lams_tool_task/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision e9bdb37e387bfd27e3e0a7a3c055a5aff96d8843)
@@ -29,13 +29,13 @@
 			<c:forEach var="user" items="${userList}">
 				<tr>
 					<td>
-						${user.loginName}
+						<c:out value="${user.loginName}" escapeXml="true"/>
 					</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>