Index: lams_tool_notebook/web/pages/export/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/export/exportPortfolio.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_notebook/web/pages/export/exportPortfolio.jsp	6 Apr 2014 20:55:00 -0000	1.10
+++ lams_tool_notebook/web/pages/export/exportPortfolio.jsp	6 Apr 2014 20:57:06 -0000	1.11
@@ -72,7 +72,7 @@
 											<fmt:message key="label.notebookEntry" />
 										</td>
 										<td>
-											<c:out value="${user.entryDTO.entry}" escapeXml="true"></c:out>
+											<lams:out value="${user.entryDTO.entry}" escapeHtml="true"/>
 										</td>
 									</tr>
 								</c:if>
Index: lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/Attic/notebookDisplay.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp	27 Mar 2014 01:55:36 -0000	1.5
+++ lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp	6 Apr 2014 20:57:44 -0000	1.6
@@ -26,7 +26,7 @@
 					<tr>
 						<td colspan="2">
 							<h2>
-								${userDTO.firstName} ${userDTO.lastName }
+								<c:out value="${userDTO.firstName} ${userDTO.lastName}" escapeXml="true"/>
 							</h2>
 						</td>
 					</tr>
@@ -53,7 +53,7 @@
 							<fmt:message key="label.notebookEntry" />
 						</td>
 						<td>
-							<c:out value="${userDTO.entryDTO.entry}" escapeXml="true"></c:out>
+							<lams:out value="${userDTO.entryDTO.entry}" escapeHtml="true"/>
 						</td>
 					</tr>
 				</table>
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/summary.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	30 Mar 2014 14:18:39 -0000	1.13
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	6 Apr 2014 20:58:47 -0000	1.14
@@ -129,7 +129,7 @@
 		<c:forEach var="user" items="${session.userDTOs}">
 			<tr>
 				<td width="30%">
-					${user.firstName} ${user.lastName}
+					<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 				</td>
 				<td width="70%">
 					<c:choose>
Index: lams_tool_pixlr/web/pages/export/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/export/exportPortfolio.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_pixlr/web/pages/export/exportPortfolio.jsp	3 Apr 2014 14:56:26 -0000	1.4
+++ lams_tool_pixlr/web/pages/export/exportPortfolio.jsp	6 Apr 2014 21:00:00 -0000	1.5
@@ -106,7 +106,7 @@
 					<tr>
 						<td><a
 							href="javascript:openPopup('${pixlrImageFolderURL}/${user.imageFileName}', ${user.imageHeight}, ${user.imageWidth})">
-						${user.firstName} ${user.lastName} </a></td>
+						<c:out value="${user.firstName} ${user.lastName}"/></a></td>
 						<td align="center"><c:choose>
 							<c:when
 								test="${user.imageFileName != null && user.imageFileName != pixlrDTO.imageFileName}">
Index: lams_tool_scratchie/web/pages/learning/waitforleader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/waitforleader.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scratchie/web/pages/learning/waitforleader.jsp	3 May 2013 16:12:18 -0000	1.1
+++ lams_tool_scratchie/web/pages/learning/waitforleader.jsp	6 Apr 2014 21:01:22 -0000	1.2
@@ -20,7 +20,7 @@
 
 	<div id="content">
 		<h1>
-			${scratchie.title}
+			<c:out value="${scratchie.title}" escapeXml="true"/>
 		</h1>
 		
 		<h2>
@@ -34,7 +34,7 @@
 		<div>
 			<c:forEach var="user" items="${groupUsers}" varStatus="status">
 				<div>
-					${user.firstName} ${user.lastName}
+					<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 				</div>
 			</c:forEach>
 		</div>
@@ -51,4 +51,4 @@
 	</div>
 
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_wookie/web/pages/monitoring/wookieDisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/web/pages/monitoring/wookieDisplay.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/web/pages/monitoring/wookieDisplay.jsp	28 Jul 2009 05:30:19 -0000	1.1
+++ lams_tool_wookie/web/pages/monitoring/wookieDisplay.jsp	6 Apr 2014 21:05:44 -0000	1.2
@@ -4,7 +4,7 @@
 	<tr>
 		<td colspan="2">
 			<h2>
-				${userDTO.firstName} ${userDTO.lastName }
+				<c:out value="${userDTO.firstName} ${userDTO.lastName}" escapeXml="true"/>
 			</h2>
 		</td>
 	</tr>
@@ -31,7 +31,7 @@
 			<fmt:message key="label.notebookEntry" />
 		</td>
 		<td>
-			<c:out value="${userDTO.entryDTO.entry}" escapeXml="false"></c:out>
+			<lams:out value="${userDTO.entryDTO.entry}" escapeHtml="true"/>
 		</td>
 	</tr>
 </table>