Index: lams_tool_forum/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.19 -r1.20
--- lams_tool_forum/conf/language/ApplicationResources.properties	22 Aug 2006 04:50:34 -0000	1.19
+++ lams_tool_forum/conf/language/ApplicationResources.properties	23 Aug 2006 01:08:22 -0000	1.20
@@ -157,3 +157,5 @@
 
 
 #======= End labels: Exported 148 labels for en AU =====
+topic.message.attachment.hidden=Message attachment hidden
+message.posting.limiting=Posting Limits
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java	22 Aug 2006 04:50:35 -0000	1.7
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ExportServlet.java	23 Aug 2006 01:08:22 -0000	1.8
@@ -69,9 +69,7 @@
 	private class StringComparator implements Comparator<String>{
 		public int compare(String o1, String o2) {
 			if(o1 != null && o2 != null){
-				int c = o1.compareTo(o2);
-				//to ensure String does not overlap even they have duplicated name.
-				return c==0?1:c;
+				return o1.compareTo(o2);
 			}else if(o1 != null)
 				return 1;
 			else
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.39 -r1.40
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	22 Aug 2006 04:50:34 -0000	1.39
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	23 Aug 2006 01:08:21 -0000	1.40
@@ -149,12 +149,11 @@
 		try {
 			mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, MODE_OPTIONAL);
 		} catch (Exception exp) {
+		}
+		if (mode == null) {
 			//set it as default mode
 			mode = ToolAccessMode.LEARNER;
 		}
-		if (mode == null) {
-			throw new ForumException("Mode is required.");
-		}
 
 		// get sessionId from HttpServletRequest
 		Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -603,7 +602,7 @@
 		List msgDtoList = forumService.getTopicThread(rootTopicId);
 		updateMesssageFlag(msgDtoList);
 		request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD, msgDtoList);
-		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID,WebUtil.readLongParam(request,ForumConstants.ATTR_SESSION_MAP_ID));
+		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID,WebUtil.readStrParam(request,ForumConstants.ATTR_SESSION_MAP_ID));
 
 		return mapping.findForward("success");
 	}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v
diff -u -r1.22 -r1.23
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	8 Aug 2006 01:56:34 -0000	1.22
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	23 Aug 2006 01:08:21 -0000	1.23
@@ -72,6 +72,7 @@
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -84,9 +85,7 @@
 	private class SessionDTOComparator implements Comparator<SessionDTO>{
 		public int compare(SessionDTO o1, SessionDTO o2) {
 			if(o1 != null && o2 != null){
-				int c = o1.getSessionName().compareTo(o2.getSessionName());
-				//to ensure session can be put into map even they have duplicated name.
-				return c==0?1:c;
+				return o1.getSessionName().compareTo(o2.getSessionName());
 			}else if(o1 != null)
 				return 1;
 			else
@@ -97,16 +96,16 @@
 	private class ForumUserComparator implements Comparator<ForumUser>{
 		public int compare(ForumUser o1, ForumUser o2) {
 			if(o1 != null && o2 != null){
-				int c = o1.getLoginName().compareTo(o2.getLoginName());
-				//to ensure ForumUser can be put into map even they have duplicated name.
-				return c==0?1:c;
+				return o1.getLoginName().compareTo(o2.getLoginName());
 			}else if(o1 != null)
 				return 1;
 			else
 				return -1;
 		}
 	}
-	
+	/**
+	 * Action method entry.
+	 */
 	public final ActionForward execute(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response)
 			throws Exception {
@@ -138,6 +137,7 @@
 		
 		if(param.equals("releaseMark"))
 			return releaseMark(mapping, form, request, response); 
+		
 		// ***************** Miscellaneous ********************
 		if (param.equals("viewTopic")) {
 			return viewTopic(mapping, form, request, response);
@@ -152,13 +152,6 @@
 	 */
 	private ActionForward init(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
-		// read in parameters and set session attributes.
-		Long toolContentID = new Long(WebUtil.readLongParam(request,
-				AttributeNames.PARAM_TOOL_CONTENT_ID));
-		request.getSession().setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID,
-				toolContentID);
-		request.getSession().setAttribute(AttributeNames.PARAM_MODE,
-				ToolAccessMode.TEACHER);
 		
 		// perform the actions for all the tabs.
 		doTabs(mapping, form, request, response);
@@ -509,10 +502,9 @@
 	 */
 	private ActionForward viewActivity(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
-		Long contentId = (Long) request.getSession().getAttribute(
-				AttributeNames.PARAM_TOOL_CONTENT_ID);
+		Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 		forumService = getForumService();
-		Forum forum = forumService.getForumByContentId(contentId);
+		Forum forum = forumService.getForumByContentId(toolContentID);
 		// if can not find out forum, echo back error message
 		if (forum == null) {
 			ActionErrors errors = new ActionErrors();
@@ -543,11 +535,10 @@
 	private ActionForward viewInstructions(ActionMapping mapping,
 			ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		Long contentId = (Long) request.getSession().getAttribute(
-				AttributeNames.PARAM_TOOL_CONTENT_ID);
-
+		Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+		
 		forumService = getForumService();
-		Forum forum = forumService.getForumByContentId(contentId);
+		Forum forum = forumService.getForumByContentId(toolContentID);
 		// if can not find out forum, echo back error message
 		if (forum == null) {
 			ActionErrors errors = new ActionErrors();
@@ -575,15 +566,14 @@
 	 */
 	private ActionForward statistic(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
-		Long contentID = (Long) request.getSession().getAttribute(
-				AttributeNames.PARAM_TOOL_CONTENT_ID);
-
+		Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+		
 		forumService = getForumService();
 		Map sessionTopicsMap = new TreeMap<SessionDTO, List<MessageDTO>>(this.new SessionDTOComparator());
 		Map sessionAvaMarkMap = new HashMap();
 		Map sessionTotalMsgMap = new HashMap();
 
-		List sessList = forumService.getSessionsByContentId(contentID);
+		List sessList = forumService.getSessionsByContentId(toolContentID);
 		Iterator sessIter = sessList.iterator();
 		while (sessIter.hasNext()) {
 			ForumToolSession session = (ForumToolSession) sessIter.next();
@@ -689,11 +679,10 @@
 	 */
 	private ActionForward userList(ActionMapping mapping,
 			HttpServletRequest request) {
-		Long contentID = (Long) request.getSession().getAttribute(
-				AttributeNames.PARAM_TOOL_CONTENT_ID);
+		Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 
 		forumService = getForumService();
-		List sessionsList = forumService.getSessionsByContentId(contentID);
+		List sessionsList = forumService.getSessionsByContentId(toolContentID);
 
 		Map sessionUsersMap = new TreeMap(this.new SessionDTOComparator());
 		// build a map with all users in the submitFilesSessionList
@@ -736,14 +725,15 @@
 	private Map getTopicsSortedByAuthor(List topicList) {
 		Map<ForumUser,List<MessageDTO>> topicsByUser = new TreeMap(this.new ForumUserComparator());
 		Iterator iter = topicList.iterator();
+		forumService = getForumService();
 		while (iter.hasNext()) {
 			MessageDTO dto = (MessageDTO) iter.next();
 			dto.getMessage().getReport();
-			List<MessageDTO> list = (List) topicsByUser
-					.get(dto.getMessage().getCreatedBy());
+			ForumUser user = (ForumUser) dto.getMessage().getCreatedBy().clone();
+			List<MessageDTO> list = (List) topicsByUser.get(user);
 			if (list == null) {
 				list = new ArrayList<MessageDTO>();
-				topicsByUser.put(dto.getMessage().getCreatedBy(), list);
+				topicsByUser.put(user, list);
 			}
 			list.add(dto);
 		}
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/advance.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_forum/web/jsps/authoring/advance.jsp	9 Aug 2006 07:09:27 -0000	1.15
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	23 Aug 2006 01:08:21 -0000	1.16
@@ -28,6 +28,26 @@
 	</tr>
 	<tr>
 		<td>
+			<html:checkbox property="forum.allowRichEditor" styleId="richEditor">
+				<fmt:message key="label.authoring.advance.use.richeditor" />
+			</html:checkbox>
+		</td>
+	</tr>	
+	<tr>
+		<td>
+			<html:checkbox property="forum.limitedInput" styleId="limitedInput">
+				<fmt:message key="label.authoring.advance.limited.input" />
+			</html:checkbox>
+			<html:text property="forum.limitedChar" styleId="limitedChar" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<h1><fmt:message key="message.posting.limiting"/></h1>
+		</td>
+	</tr>	
+	<tr>
+		<td>
 			<html:radio property="forum.allowNewTopic" value="true" onclick="allowNewTopic()">
 				<fmt:message key="label.authoring.advance.allow.new.topics" />
 			</html:radio>
@@ -68,22 +88,7 @@
 				<html:option value="10">10</html:option>				
 			</html:select>
 		</td>
-	</tr>
-	<tr>
-		<td>
-			<html:checkbox property="forum.allowRichEditor" styleId="richEditor">
-				<fmt:message key="label.authoring.advance.use.richeditor" />
-			</html:checkbox>
-		</td>
 	</tr>	
-	<tr>
-		<td>
-			<html:checkbox property="forum.limitedInput" styleId="limitedInput">
-				<fmt:message key="label.authoring.advance.limited.input" />
-			</html:checkbox>
-			<html:text property="forum.limitedChar" styleId="limitedChar" />
-		</td>
-	</tr>
 </table>
 
 <script type="text/javascript">
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/basic.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_forum/web/jsps/authoring/basic.jsp	18 Aug 2006 06:59:43 -0000	1.20
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	23 Aug 2006 01:08:21 -0000	1.21
@@ -10,16 +10,20 @@
 	 */
 	function showMessage(url) {
 		var area=document.getElementById("messageArea");
-		area.style.width="670px";
-		area.style.height="100%";
-		area.src=url;
-		area.style.display="block";
+		if(area != null){
+			area.style.width="670px";
+			area.style.height="100%";
+			area.src=url;
+			area.style.display="block";
+		}
 	}
 	function hideMessage(){
 		var area=document.getElementById("messageArea");
-		area.style.width="0px";
-		area.style.height="0px";
-		area.style.display="none";
+		if(area != null){
+			area.style.width="0px";
+			area.style.height="0px";
+			area.style.display="none";
+		}
 	}
 </script>
 
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.10 -r1.11
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	22 Aug 2006 04:50:34 -0000	1.10
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	23 Aug 2006 01:08:20 -0000	1.11
@@ -34,7 +34,7 @@
 					<html:rewrite page="/learning/newTopic.do?sessionMapID=${sessionMapID}" />
 				</c:set>
 				<c:set var="refresh">
-					<html:rewrite page="/learning/viewForum.do?toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}" />
+					<html:rewrite page="/learning/viewForum.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}" />
 				</c:set>
 				<c:set var="finish">
 					<html:rewrite page="/learning/finish.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}" />
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/viewtopic.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	22 Aug 2006 04:50:34 -0000	1.10
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	23 Aug 2006 01:08:20 -0000	1.11
@@ -22,7 +22,7 @@
 
 	<p>
 		<c:set var="backToForum">
-			<html:rewrite page="/learning/viewForum.do?sessionMapID=${sessionMapID}&toolSessionID=${sessionMap.toolSessionID}" />
+			<html:rewrite page="/learning/viewForum.do?mode=${sessionMap.mode}&sessionMapID=${sessionMapID}&toolSessionID=${sessionMap.toolSessionID}" />
 		</c:set>
 		<html:button property="backToForum" onclick="javascript:location.href='${backToForum}';" styleClass="button">
 			<fmt:message key="label.back.to.forum" />
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicview.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	22 Aug 2006 04:50:35 -0000	1.14
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	23 Aug 2006 01:08:22 -0000	1.15
@@ -7,7 +7,7 @@
 			<tr>
 				<th class="first">
 					<c:choose>
-						<c:when test='${(sessionMap.mode == "teacher") || (not sessionMap.hidden)}'>
+						<c:when test='${(sessionMap.mode == "teacher") || (not hidden)}'>
 							<b> <c:out value="${msgDto.message.subject}" /> </b>
 						</c:when>
 						<c:otherwise>
@@ -18,7 +18,7 @@
 			</tr>
 			<tr>
 				<td class="first posted-by">
-					<c:if test='${(sessionMap.mode == "teacher") || (not sessionMap.hidden)}'>
+					<c:if test='${(sessionMap.mode == "teacher") || (not hidden)}'>
 						<fmt:message key="lable.topic.subject.by" />
 						<c:out value="${msgDto.author}" />
 								-
@@ -29,10 +29,10 @@
 			</tr>
 			<tr>
 				<td>
-					<c:if test='${(not sessionMap.hidden) || (sessionMap.hidden && sessionMap.mode == "teacher")}'>
+					<c:if test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
 						<c:out value="${msgDto.message.body}" escapeXml="false" />
 					</c:if>
-					<c:if test='${sessionMap.hidden}'>
+					<c:if test='${hidden}'>
 						<fmt:message key="topic.message.body.hidden" />
 					</c:if>
 				</td>
@@ -41,12 +41,17 @@
 			<c:if test="${not empty msgDto.message.attachments}">
 				<tr>
 					<td>
-						<c:forEach var="file" items="${msgDto.message.attachments}">
-							<c:set var="downloadURL">
-								<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
-							</c:set>
-							<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <c:out value="${file.fileName}" /> </a>
-						</c:forEach>
+						<c:if test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
+							<c:forEach var="file" items="${msgDto.message.attachments}">
+								<c:set var="downloadURL">
+									<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <c:out value="${file.fileName}" /> </a>
+							</c:forEach>
+						</c:if>
+						<c:if test='${hidden}'>
+							<fmt:message key="topic.message.attachment.hidden" />
+						</c:if>
 					</td>
 				</tr>
 			</c:if>
@@ -80,13 +85,13 @@
 						<c:if test='${sessionMap.mode == "teacher"}'>
 							<!--  call the hide action -->
 							<c:choose>
-								<c:when test="${sessionMap.hidden}">
+								<c:when test="${hidden}">
 									<!--  display a show link  -->
 									<c:set var="hidetopic">
 										<html:rewrite page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&msgId=${msgDto.message.uid}&hideFlag=false" />
 									</c:set>
 									<html:link href="${hidetopic}" styleClass="button">
-										<b> <fmt:message key="label.show" /> </b>
+										<fmt:message key="label.show" /> 
 									</html:link>
 								</c:when>
 								<c:otherwise>
@@ -95,14 +100,14 @@
 										<html:rewrite page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&hideFlag=true" />
 									</c:set>
 									<html:link href="${hidetopic}" styleClass="button">
-										<b> <fmt:message key="label.hide" /> </b>
+										<fmt:message key="label.hide" />
 									</html:link>
 								</c:otherwise>
 							</c:choose>
 						</c:if>
-
+						
 						<!--  Edit Button -->
-						<c:if test="${not sessionMap.hidden}">
+						<c:if test="${not hidden}">
 							<c:if test='${(sessionMap.mode == "teacher") || (msgDto.isAuthor && not sessionMap.finishedLock && sessionMap.allowEdit && (empty msgDto.mark))}'>
 								<c:set var="edittopic">
 									<html:rewrite page="/learning/editTopic.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&rootUid=${sessinoMap.rootUid}&create=${msgDto.message.created.time}" />
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.4 -r1.5
--- lams_tool_forum/web/jsps/monitoring/summary.jsp	8 Aug 2006 01:56:34 -0000	1.4
+++ lams_tool_forum/web/jsps/monitoring/summary.jsp	23 Aug 2006 01:08:22 -0000	1.5
@@ -48,7 +48,6 @@
 <c:forEach var="element" items="${sessionUserMap}">
 	<c:set var="toolSessionDto" value="${element.key}" />
 	<c:set var="userlist" value="${element.value}" />
-	<c:set var="toolAccessMode" value="${mode}" />
 
 	<table cellpadding="0">
 		<tr><td colspan="3">
@@ -94,7 +93,7 @@
 		<tr>
 			<td align="right">
 				<html:form action="/learning/viewForum.do" target="_blank">
-					<html:hidden property="mode" value="${toolAccessMode}" />
+					<html:hidden property="mode" value="teacher"/>
 					<html:hidden property="toolSessionID" value="${toolSessionDto.sessionID}" />
 					<html:submit property="viewForum" styleClass="button">
 						<fmt:message key="label.monitoring.summary.view.forum" />
Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/viewmarks.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	8 Aug 2006 01:56:34 -0000	1.1
+++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	23 Aug 2006 01:08:22 -0000	1.2
@@ -24,16 +24,18 @@
 	
 	
 		<c:forEach items="${topicList}" var="topic" varStatus="status">
+			<c:if test="${status.first}">
+				<tr>
+					<td colspan="5">
+						<c:out value="${user.loginName}" />
+						,
+						<c:out value="${user.firstName}" />
+						<c:out value="${user.lastName}" />
+						<fmt:message key="monitoring.user.post.topic" />
+					</td>
+				</tr>
+			</c:if>
 			<tr>
-				<td colspan="5">
-					<c:out value="${user.loginName}" />
-					,
-					<c:out value="${user.firstName}" />
-					<c:out value="${user.lastName}" />
-					<fmt:message key="monitoring.user.post.topic" />
-				</td>
-			</tr>
-			<tr>
 				<td>
 					<c:set var="viewtopic">
 						<html:rewrite page="/monitoring/viewTopic.do?messageID=${topic.message.uid}&create=${topic.message.created.time}" />