Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v
diff -u -r1.32 -r1.33
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	8 Aug 2006 01:56:34 -0000	1.32
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	9 Aug 2006 05:17:32 -0000	1.33
@@ -53,6 +53,7 @@
 
 	public static final int SESSION_STATUS_FINISHED = 1;
 	public static final String ALLOW_EDIT = "allowEdit";
+	public static final String ATTR_ALLOW_UPLOAD = "allowUpload";
 	public static final String ALLOW_RICH_EDITOR = "allowRichEditor";
 	public static final String LIMITED_CHARS = "limitedChars";
 
@@ -90,6 +91,7 @@
 	public static final String ATTR_REPORT = "report";
 	
 	public static final String PARAM_UPDATE_MODE = "updateMode";
+
 	
 	
 }
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.36 -r1.37
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	3 Jul 2006 05:34:56 -0000	1.36
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	9 Aug 2006 05:17:32 -0000	1.37
@@ -83,9 +83,6 @@
 		if (param.equals("viewForum")) {
 			return viewForm(mapping, form, request, response);
 		}
-		if (param.equals("newTopic")) {
-			return newTopic(mapping, form, request, response);
-		}
 		if (param.equals("finish")) {
 			return finish(mapping, form, request, response);
 		}
@@ -94,6 +91,9 @@
 		if (param.equals("viewTopic")) {
 			return viewTopic(mapping, form, request, response);
 		}
+		if (param.equals("newTopic")) {
+			return newTopic(mapping, form, request, response);
+		}
 		if (param.equals("createTopic")) {
 			return createTopic(mapping, form, request, response);
 		}
@@ -185,12 +185,13 @@
 		}
 		
 		Long forumId = forum.getUid();
-		Boolean allowEdit = new Boolean(forum.isAllowEdit());
 		Boolean allowRichEditor = new Boolean(forum.isAllowRichEditor());
 		int allowNumber = forum.getLimitedChar();
 		
 		request.getSession().setAttribute(ForumConstants.FORUM_ID, forumId);
-		request.getSession().setAttribute(ForumConstants.ALLOW_EDIT, allowEdit);
+		request.getSession().setAttribute(ForumConstants.ALLOW_EDIT, forum.isAllowEdit());
+		request.getSession().setAttribute(ForumConstants.ATTR_ALLOW_UPLOAD,forum.isAllowUpload());
+		
 		request.getSession().setAttribute(ForumConstants.ALLOW_RICH_EDITOR,
 				allowRichEditor);
 		request.getSession().setAttribute(ForumConstants.LIMITED_CHARS,
@@ -229,7 +230,8 @@
 		ForumToolSession session = forumService
 				.getSessionBySessionId(sessionId);
 		
-		request.setAttribute(ForumConstants.FORUM_TITLE,session.getForum().getTitle());
+		Forum forum = session.getForum();
+		request.setAttribute(ForumConstants.FORUM_TITLE,forum.getTitle());
 		return mapping.findForward("success");
 	}
 
@@ -403,7 +405,6 @@
 		
 		String title = getForumTitle(topic);
 		request.setAttribute(ForumConstants.FORUM_TITLE,title);
-		
 		return mapping.findForward("success");
 	}
 
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topiceditform.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	2 Jul 2006 04:14:27 -0000	1.8
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	9 Aug 2006 05:17:32 -0000	1.9
@@ -18,32 +18,33 @@
 			<%@include file="bodyarea.jsp"%>
 		</td>
 	</tr>
-
+	<c:if test="${topic.hasAttachment || allowUpload}">
+		<tr>
+			<td class="field-name">
+				<bean:message key="message.label.attachment" />
+			</td>
+			<td>
+				<c:if test="${topic.hasAttachment}">
+					<c:forEach var="file" items="${topic.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:set var="deleteURL">
+							<html:rewrite page="/learning/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}" />
+						</c:set>
+						&nbsp;
+						<a href="<c:out value='${deleteURL}'/>"> <fmt:message key="label.delete" /> </a>
+					</c:forEach>
+				</c:if>
+				<c:if test="${not topic.hasAttachment && allowUpload}">
+					<html:file tabindex="3" property="attachmentFile" />
+					<html:errors property="message.attachment" />
+				</c:if>
+			</td>
+		</tr>
+	</c:if>
 	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.attachment" />
-		</td>
-		<td>
-			<c:if test="${topic.hasAttachment}">
-				<c:forEach var="file" items="${topic.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:set var="deleteURL">
-						<html:rewrite page="/learning/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}" />
-					</c:set>
-					&nbsp;
-					<a href="<c:out value='${deleteURL}'/>"> <fmt:message key="label.delete" /> </a>
-				</c:forEach>
-			</c:if>
-			<c:if test="${not topic.hasAttachment}">
-				<html:file tabindex="3" property="attachmentFile" />
-				<html:errors property="message.attachment" />
-			</c:if>
-		</td>
-	</tr>
-	<tr>
 		<td></td>
 		<td>
 			<html:submit styleClass="button">
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicform.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	2 Jul 2006 04:14:27 -0000	1.6
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	9 Aug 2006 05:17:32 -0000	1.7
@@ -21,15 +21,17 @@
 			<%@include file="bodyarea.jsp"%>
 		</td>
 	</tr>
-	<tr>
-		<td class="field-name">
-			<bean:message key="message.label.attachment" />
-		</td>
-		<td>
-			<html:file tabindex="3" property="attachmentFile" />
-			<html:errors property="message.attachment" />
-		</td>
-	</tr>
+	<c:if test="${allowUpload}">
+		<tr>
+			<td class="field-name">
+				<bean:message key="message.label.attachment" />
+			</td>
+			<td>
+				<html:file tabindex="3" property="attachmentFile" />
+				<html:errors property="message.attachment" />
+			</td>
+		</tr>
+	</c:if>
 </table>
 
 <div class="right-buttons">
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	2 Jul 2006 04:14:27 -0000	1.6
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	9 Aug 2006 05:17:32 -0000	1.7
@@ -16,16 +16,18 @@
 			<%@include file="bodyarea.jsp"%>
 		</td>
 	</tr>
+	<c:if test="${allowUpload}">
+		<tr>
+			<td class="field-name">
+				<b><bean:message key="message.label.attachment" /></b>
+			</td>
+			<td>
+				<html:file tabindex="3" property="attachmentFile" />
+				<html:errors property="message.attachment" />
+			</td>
+		</tr>
+	</c:if>
 	<tr>
-		<td class="field-name">
-			<b><bean:message key="message.label.attachment" /></b>
-		</td>
-		<td>
-			<html:file tabindex="3" property="attachmentFile" />
-			<html:errors property="message.attachment" />
-		</td>
-	</tr>
-	<tr>
 		<td></td>
 		<td>