Index: lams_build/lib/struts/src/struts-1.2.9-src.zip
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/struts/src/Attic/struts-1.2.9-src.zip,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.41 -r1.42
--- lams_tool_forum/conf/language/lams/ApplicationResources.properties	29 Dec 2011 11:21:34 -0000	1.41
+++ lams_tool_forum/conf/language/lams/ApplicationResources.properties	15 Feb 2012 19:15:24 -0000	1.42
@@ -234,5 +234,7 @@
 monitor.summary.date.restriction.set  =Date restriction has been set
 monitor.summary.date.restriction.removed  =Date restriction has been removed
 
-
+errors.maxfilesize=Uploaded file exceeded maximum size: {0}
+error.attachment.executable=Uploaded file is executable
+label.upload.info=Uploaded file must not be executable and not exceed size of {0} bytes
 #======= End labels: Exported 227 labels for en AU =====
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.57 -r1.58
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	13 May 2011 07:27:15 -0000	1.57
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	15 Feb 2012 19:15:24 -0000	1.58
@@ -43,9 +43,7 @@
     public static final int STATUS_CONTENT_COPYED = 1;
 
     public static final int SESSION_STATUS_FINISHED = 1;
-
-    public final static int MAX_FILE_SIZE = 250 * 1000;
-
+    
     public final static String FORUM_SERVICE = "forumService";
 
     public final static String CONTENT_HANDLER = "toolContentHandler";
@@ -100,6 +98,8 @@
     public static final String ATTR_FINISHED_LOCK = "finishedLock";
 
     public static final String ATTR_USER_FINISHED = "userFinished";
+    
+    public static final String ATTR_UPLOAD_MAX_FILE_SIZE = "uploadMaxFileSize";
 
     // for submission deadline LDEV-2657
 
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.72 -r1.73
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	13 May 2011 07:27:15 -0000	1.72
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	15 Feb 2012 19:15:24 -0000	1.73
@@ -73,6 +73,8 @@
 import org.lamsfoundation.lams.tool.forum.web.forms.MessageForm;
 import org.lamsfoundation.lams.tool.forum.web.forms.ReflectionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -89,6 +91,8 @@
 
     private static final boolean MODE_OPTIONAL = false;
 
+    private static final int UPLOAD_MAX_FILE_SIZE = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE);
+
     private IForumService forumService;
 
     @Override
@@ -617,7 +621,9 @@
 	// as it has a link from the view topic screen back to View Forum screen.
 	boolean hideReflection = WebUtil.readBooleanParam(request, ForumConstants.ATTR_HIDE_REFLECTION, false);
 	sessionMap.put(ForumConstants.ATTR_HIDE_REFLECTION, hideReflection);
-
+	
+	sessionMap.put(ForumConstants.ATTR_UPLOAD_MAX_FILE_SIZE, LearningAction.UPLOAD_MAX_FILE_SIZE);
+	
 	return mapping.findForward("success");
     }
 
Index: lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp	23 Sep 2011 18:55:33 -0000	1.11
+++ lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp	15 Feb 2012 19:15:24 -0000	1.12
@@ -49,7 +49,7 @@
   			});
   		}
   		function prepareFormData(){
-			//SCKeditor content is not submitted when sending by jQuery; we need to do this
+			//CKeditor content is not submitted when sending by jQuery; we need to do this
 			
 			var instructions = CKEDITOR.instances.instructions.getData();
 			document.getElementById("instructions").value=instructions;
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.15 -r1.16
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	23 May 2008 06:54:40 -0000	1.15
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	15 Feb 2012 19:15:24 -0000	1.16
@@ -20,6 +20,11 @@
 			<div class="field-name title-space-top">
 				<fmt:message key="message.label.attachment" />
 			</div>
+			<div style="font-style: italic; margin-bottom: 10px">
+				<fmt:message key="label.upload.info">
+					<fmt:param>${sessionMap.uploadMaxFileSize}</fmt:param>
+				</fmt:message>
+			</div>
 			<html:file tabindex="3" property="attachmentFile" />
 			<html:errors property="message.attachment" />