Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r0eef3496f1da00bff0cba32a35ef61cf9805c0c2
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 0eef3496f1da00bff0cba32a35ef61cf9805c0c2)
@@ -87,6 +87,6 @@
 alter table tl_lafrum11_message_seq add index FKD2C71F8845213B4D (root_message_uid), add constraint FKD2C71F8845213B4D foreign key (root_message_uid) references tl_lafrum11_message (uid);
 alter table tl_lafrum11_tool_session add index FK5A04D7AE131CE31E (forum_uid), add constraint FK5A04D7AE131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid);
 
-INSERT INTO tl_lafrum11_forum (title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_edit,allow_rich_editor) VALUES("LAMS Forum","Instruction","Online instruction","Offline instruction",1,0,0,0,0,0,0,0);
+INSERT INTO tl_lafrum11_forum (title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_edit,allow_rich_editor) VALUES("LAMS Forum","Instruction","Online instruction","Offline instruction",1,0,0,0,0,0,1,0);
 INSERT INTO tl_lafrum11_tool_session (forum_uid,session_id,status) VALUES(1,1,0);
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r0eef3496f1da00bff0cba32a35ef61cf9805c0c2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	(.../MessageDTO.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	(.../MessageDTO.java)	(revision 0eef3496f1da00bff0cba32a35ef61cf9805c0c2)
@@ -21,12 +21,9 @@
 package org.lamsfoundation.lams.tool.forum.dto;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
 
 
@@ -36,7 +33,6 @@
 	private String author;
 	private boolean hasAttachment;
 	private short level;
-	private String bodyByHtml;
 	private int threadNum;
 	
 
@@ -46,10 +42,6 @@
 		
 		MessageDTO dto = new MessageDTO();
 		dto.setMessage(msg);
-		if(!StringUtils.isEmpty(msg.getBody()))
-			dto.setBodyByHtml(msg.getBody().replaceAll("\n","<BR>"));
-		else
-			dto.setBodyByHtml("");		
 		dto.setAuthor(authorName);
 		if(msg.getAttachments() == null || msg.getAttachments().isEmpty())
 			dto.setHasAttachment(false);
@@ -71,10 +63,6 @@
 		while(iter.hasNext()){
 			Message msg = (Message) iter.next();
 			MessageDTO msgDto = new MessageDTO();
-			if(!StringUtils.isEmpty(msg.getBody()))
-				msgDto.setBodyByHtml(msg.getBody().replaceAll("\n","<BR>"));
-			else
-				msgDto.setBodyByHtml("");
 			if(msg.getAttachments() == null || msg.getAttachments().isEmpty())
 				msgDto.setHasAttachment(false);
 			else
@@ -94,10 +82,6 @@
 		while(iter.hasNext()){
 			Message msg = (Message) iter.next();
 			MessageDTO msgDto = new MessageDTO();
-			if(!StringUtils.isEmpty(msg.getBody()))
-				msgDto.setBodyByHtml(msg.getBody().replaceAll("\n","<BR>"));
-			else
-				msgDto.setBodyByHtml("");
 			if(msg.getAttachments() == null || msg.getAttachments().isEmpty())
 				msgDto.setHasAttachment(false);
 			else
@@ -139,12 +123,5 @@
 	public void setThreadNum(int threadNum) {
 		this.threadNum = threadNum;
 	}
-
-	public String getBodyByHtml() {
-		return bodyByHtml;
-	}
-
-	public void setBodyByHtml(String bodyByHtml) {
-		this.bodyByHtml = bodyByHtml;
-	}	
+	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
===================================================================
diff -u -r3de24b3fb4e2ead20d187f4b5000464ae2791262 -r0eef3496f1da00bff0cba32a35ef61cf9805c0c2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 0eef3496f1da00bff0cba32a35ef61cf9805c0c2)
@@ -31,11 +31,12 @@
 	private String offlineInstructions;
 	private boolean defineLater;
 	private boolean contentInUse;
-	private Set messages;
-	private Set attachments;
 	private Date created;
 	private Date updated;
 	private Long createdBy;
+	
+	private Set messages;
+	private Set attachments;
     
   	public Forum(){
   		attachments = new HashSet();
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r0eef3496f1da00bff0cba32a35ef61cf9805c0c2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 0eef3496f1da00bff0cba32a35ef61cf9805c0c2)
@@ -26,6 +26,8 @@
 	public static final String FORUM_ID = "forum_id";
 
 	public static final int SESSION_STATUS_FINISHED = 1;
+	public static final String ALLOW_EDIT = "allowEdit";
+	public static final String ALLOW_RICH_EDITOR = "allowRichEditor";
 	
 	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r0eef3496f1da00bff0cba32a35ef61cf9805c0c2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0eef3496f1da00bff0cba32a35ef61cf9805c0c2)
@@ -136,19 +136,15 @@
 		ForumForm forumForm = (ForumForm)form;
 		//get back the topic list and display them on page
 		forumService = getForumManager();
-		//get login user (author)
-		HttpSession ss = SessionManager.getSession();
-		//get back login user DTO
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		
+
 		List topics = null;
 		Forum forum = null;
 		try {
 			forum = forumService.getForumByContentId(contentId);
 			topics = forumService.getAuthoredTopics(contentId);
 			forumForm.setForum(forum);
 			forumForm.setToolContentID(contentId);
-		} catch (PersistenceException e) {
+		} catch (Exception e) {
 			log.error(e);
 			return mapping.findForward("error");
 		}
@@ -389,14 +385,14 @@
 			    		forumPO.setMessages(msgSet);
 			    	}
 			    	//restore new topic into ForumPO message set.
-			    	Message msg;
-			    	Iterator iter = forum.getMessages().iterator();
-			    	while(iter.hasNext()){
-			    		msg = (Message) iter.next();
-			    		//new topic, then add to PO
-			    		if(msg.getUid() == null)
-			    			msgSet.add(msg);
-			    	}
+//			    	Message msg;
+//			    	Iterator iter = forum.getMessages().iterator();
+//			    	while(iter.hasNext()){
+//			    		msg = (Message) iter.next();
+//			    		//new topic, then add to PO
+//			    		if(msg.getUid() == null)
+//			    			msgSet.add(msg);
+//			    	}
 				}
 				PropertyUtils.copyProperties(forumPO,forum);
 				//copy back
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r0eef3496f1da00bff0cba32a35ef61cf9805c0c2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 0eef3496f1da00bff0cba32a35ef61cf9805c0c2)
@@ -104,7 +104,11 @@
 			return mapping.findForward("error");
 		}
 		Long forumId = session.getForum().getUid();
+		Boolean allowEdit = new Boolean(session.getForum().isAllowEdit());
+		Boolean allowRichEditor = new Boolean(session.getForum().isAllowRichEditor());
 		request.getSession().setAttribute(ForumConstants.FORUM_ID, forumId);
+		request.getSession().setAttribute(ForumConstants.ALLOW_EDIT, allowEdit);
+		request.getSession().setAttribute(ForumConstants.ALLOW_RICH_EDITOR, allowRichEditor);
 		
 		//get all root topic to display on init page
 		List rootTopics = forumService.getRootTopics(sessionId);
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r0eef3496f1da00bff0cba32a35ef61cf9805c0c2
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 0eef3496f1da00bff0cba32a35ef61cf9805c0c2)
@@ -21,7 +21,7 @@
 			<tr>
 				<td>
 					<br>
-					<c:out value="${topic.bodyByHtml}" escapeXml="false" />
+					<c:out value="${topic.message.body}" escapeXml="false" />
 				</td>
 			</tr>
 			<tr>
@@ -40,13 +40,14 @@
 			<tr>
 				<td align="right">
 					<br>
-					<c:set var="edittopic">
-						<html:rewrite page="/learning/editTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
-					</c:set> 
-					<html:link href="${edittopic}">
-						<b><fmt:message key="label.edit" /></b>
-					</html:link>
-					
+					<c:if test="${sessionScope.allowEdit}">
+						<c:set var="edittopic">
+							<html:rewrite page="/learning/editTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
+						</c:set> 
+						<html:link href="${edittopic}">
+							<b><fmt:message key="label.edit" /></b>
+						</html:link>
+					</c:if>
 					<c:set var="replytopic">
 						<html:rewrite page="/learning/newReplyTopic.do?parentId=${topic.message.uid}" />
 					</c:set> 
Index: lams_tool_forum/web/jsps/message/topicview.jsp
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r0eef3496f1da00bff0cba32a35ef61cf9805c0c2
--- lams_tool_forum/web/jsps/message/topicview.jsp	(.../topicview.jsp)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/web/jsps/message/topicview.jsp	(.../topicview.jsp)	(revision 0eef3496f1da00bff0cba32a35ef61cf9805c0c2)
@@ -29,7 +29,7 @@
 		<tr>
 			<td>
 				<br>
-				<c:out value="${topic.bodyByHtml}" escapeXml="false" />
+				<c:out value="${topic.message.body}" escapeXml="false" />
 			</td>
 		</tr>
 		<tr>