Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/Forum.hbm.xml,v
diff -u -r1.15 -r1.16
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	9 Jun 2006 01:58:45 -0000	1.15
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	8 Aug 2006 06:39:36 -0000	1.16
@@ -204,6 +204,38 @@
             column="limited_input_flag"
         />
 
+        <property
+            name="allowNewTopic"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_new_topic"
+        />
+
+        <property
+            name="allowUpload"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_upload"
+        />
+
+        <property
+            name="maximumReply"
+            type="int"
+            update="true"
+            insert="true"
+            column="maximum_reply"
+        />
+
+        <property
+            name="minimumReply"
+            type="int"
+            update="true"
+            insert="true"
+            column="minimum_reply"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Forum.xml
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumToolSession.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	27 Feb 2006 01:41:20 -0000	1.2
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	8 Aug 2006 06:39:36 -0000	1.3
@@ -76,6 +76,14 @@
             length="250"
         />
 
+        <property
+            name="markReleased"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="mark_released"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ForumToolSession.xml
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.13 -r1.14
--- lams_tool_forum/conf/language/ApplicationResources.properties	8 Aug 2006 01:56:34 -0000	1.13
+++ lams_tool_forum/conf/language/ApplicationResources.properties	8 Aug 2006 06:39:36 -0000	1.14
@@ -146,3 +146,10 @@
 button.close=Close
 button.release.mark=Release marks
 msg.mark.released=Marks in {0} have been released.
+label.authoring.advance.allow.upload=Allow learners to upload file
+label.authoring.advance.allow.new.topics=Allow Learners to create new topics
+label.authoring.advance.number.reply=Number of posting per learner per topic 
+label.authoring.advance.minimum.reply=Minimum:
+label.authoring.advance.maximum.reply=Maximum:
+label.authoring.advance.no.minimum=No minimum
+label.authoring.advance.no.maximum=No maximum
\ No newline at end of file
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/create_lams_tool_forum.sql,v
diff -u -r1.22 -r1.23
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	8 Aug 2006 01:56:34 -0000	1.22
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	8 Aug 2006 06:39:37 -0000	1.23
@@ -25,19 +25,23 @@
    update_date datetime,
    create_by bigint,
    title varchar(255),
-   allow_anonym bit,
-   run_offline bit,
-   lock_on_finished bit,
+   allow_anonym smallint,
+   run_offline smallint,
+   lock_on_finished smallint,
    instructions text,
    online_instructions text,
    offline_instructions text,
-   content_in_use bit,
-   define_later bit,
+   content_in_use smallint,
+   define_later smallint,
    content_id bigint unique,
-   allow_edit bit,
-   allow_rich_editor bit,
+   allow_edit smallint,
+   allow_rich_editor smallint,
+   allow_new_topic smallint, 
+   allow_upload smallint, 
+   maximum_reply integer, 
+   minimum_reply integer,
    limited_of_chars integer,
-   limited_input_flag bit,
+   limited_input_flag smallint,
    primary key (uid)
 );
 create table tl_lafrum11_forum_user (
@@ -58,13 +62,13 @@
    modified_by bigint,
    subject varchar(255),
    body text,
-   is_authored bit,
-   is_anonymous bit,
+   is_authored smallint,
+   is_anonymous smallint,
    forum_session_uid bigint,
    parent_uid bigint,
    forum_uid bigint,
    reply_number integer,
-   hide_flag bit,
+   hide_flag smallint,
    report_id bigint,
    primary key (uid)
 );
@@ -108,5 +112,5 @@
 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,limited_input_flag,limited_of_chars) VALUES("LAMS Forum","Instruction","Online instruction","Offline instruction",${default_content_id},0,0,0,0,0,1,0,1,5000);
+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, allow_new_topic,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars) VALUES("LAMS Forum","Instruction","Online instruction","Offline instruction",${default_content_id},0,0,0,0,0,1,0,1,1,0,0,1,5000);
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_forum/db/sql/table-schema.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/table-schema.sql,v
diff -u -r1.19 -r1.20
--- lams_tool_forum/db/sql/table-schema.sql	8 Aug 2006 01:56:34 -0000	1.19
+++ lams_tool_forum/db/sql/table-schema.sql	8 Aug 2006 06:39:37 -0000	1.20
@@ -19,7 +19,7 @@
 drop table if exists tl_lafrum11_report;
 drop table if exists tl_lafrum11_tool_session;
 create table tl_lafrum11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, forum_uid bigint, message_uid bigint, primary key (uid));
-create table tl_lafrum11_forum (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), allow_anonym bit, run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_edit bit, allow_rich_editor bit, limited_of_chars integer, limited_input_flag bit, primary key (uid));
+create table tl_lafrum11_forum (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), allow_anonym bit, run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_edit bit, allow_rich_editor bit, limited_of_chars integer, limited_input_flag bit, allow_new_topic bit, allow_upload bit, maximum_reply integer, minimum_reply integer, primary key (uid));
 create table tl_lafrum11_forum_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), session_id bigint, login_name varchar(255), primary key (uid));
 create table tl_lafrum11_message (uid bigint not null auto_increment, create_date datetime, last_reply_date datetime, update_date datetime, create_by bigint, modified_by bigint, subject varchar(255), body text, is_authored bit, is_anonymous bit, forum_session_uid bigint, parent_uid bigint, forum_uid bigint, reply_number integer, hide_flag bit, report_id bigint, primary key (uid));
 create table tl_lafrum11_message_seq (uid bigint not null auto_increment, root_message_uid bigint, message_uid bigint, message_level smallint, primary key (uid));
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/Forum.hbm.xml,v
diff -u -r1.15 -r1.16
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	9 Jun 2006 01:58:45 -0000	1.15
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	8 Aug 2006 06:39:36 -0000	1.16
@@ -204,6 +204,38 @@
             column="limited_input_flag"
         />
 
+        <property
+            name="allowNewTopic"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_new_topic"
+        />
+
+        <property
+            name="allowUpload"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_upload"
+        />
+
+        <property
+            name="maximumReply"
+            type="int"
+            update="true"
+            insert="true"
+            column="maximum_reply"
+        />
+
+        <property
+            name="minimumReply"
+            type="int"
+            update="true"
+            insert="true"
+            column="minimum_reply"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Forum.xml
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java,v
diff -u -r1.25 -r1.26
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	9 Jun 2006 01:58:45 -0000	1.25
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	8 Aug 2006 06:39:36 -0000	1.26
@@ -57,6 +57,11 @@
 	private boolean runOffline;
 	private boolean allowAnonym;
 	private boolean allowEdit;
+	private boolean allowNewTopic;
+	private boolean allowUpload;
+	private int maximumReply;
+	private int minimumReply;
+	
 	private boolean allowRichEditor;
 	private String instructions;
 	private String onlineInstructions;
@@ -491,4 +496,44 @@
 	public void setToolContentHandler(ForumToolContentHandler toolContentHandler) {
 		this.toolContentHandler = toolContentHandler;
 	}
+	/**
+	 * @hibernate.property column="allow_new_topic"
+	 * @return
+	 */	
+	public boolean isAllowNewTopic() {
+		return allowNewTopic;
+	}
+	public void setAllowNewTopic(boolean allowNewTopic) {
+		this.allowNewTopic = allowNewTopic;
+	}
+	/**
+	 * @hibernate.property column="allow_upload"
+	 * @return
+	 */
+	public boolean isAllowUpload() {
+		return allowUpload;
+	}
+	public void setAllowUpload(boolean allowUpload) {
+		this.allowUpload = allowUpload;
+	}
+	/**
+	 * @hibernate.property column="maximum_reply"
+	 * @return
+	 */	
+	public int getMaximumReply() {
+		return maximumReply;
+	}
+	public void setMaximumReply(int maximumReply) {
+		this.maximumReply = maximumReply;
+	}
+	/**
+	 * @hibernate.property column="minimum_reply"
+	 * @return
+	 */	
+	public int getMinimumReply() {
+		return minimumReply;
+	}
+	public void setMinimumReply(int minimumReply) {
+		this.minimumReply = minimumReply;
+	}
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumToolSession.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	27 Feb 2006 01:41:20 -0000	1.2
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	8 Aug 2006 06:39:36 -0000	1.3
@@ -76,6 +76,14 @@
             length="250"
         />
 
+        <property
+            name="markReleased"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="mark_released"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ForumToolSession.xml
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java,v
diff -u -r1.11 -r1.12
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java	6 Apr 2006 06:40:39 -0000	1.11
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java	8 Aug 2006 06:39:36 -0000	1.12
@@ -137,6 +137,8 @@
     	forum.setAllowRichEditor(false);
     	forum.setLimitedInput(false);
     	forum.setLockWhenFinished(false);
+    	forum.setAllowNewTopic(false);
+    	forum.setAllowUpload(false);
     }
     //-------------------------get/set methods----------------
     public Forum getForum() {
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.12 -r1.13
--- lams_tool_forum/web/jsps/authoring/advance.jsp	5 Jul 2006 05:39:44 -0000	1.12
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	8 Aug 2006 06:39:37 -0000	1.13
@@ -20,13 +20,50 @@
 	</tr>
 	<tr>
 		<td>
+			<html:checkbox property="forum.allowUpload">
+				<fmt:message key="label.authoring.advance.allow.upload" />
+			</html:checkbox>
+		</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:radio property="forum.allowNewTopic" value="true" onclick="allowNewTopic()">
+				<fmt:message key="label.authoring.advance.allow.new.topics" />
+			</html:radio>
+		</td>
 	</tr>
 	<tr>
 		<td>
+			<html:radio property="forum.allowNewTopic" value="false" onclick="allowNewTopic()">
+				<fmt:message key="label.authoring.advance.number.reply" />
+			</html:radio>
+			<BR>&nbsp;&nbsp;
+			<fmt:message key="label.authoring.advance.minimum.reply" />
+			<html:select property="forum.minimumReply" styleId="minimumReply">
+				<html:option value="0"><fmt:message key="label.authoring.advance.no.minimum"/></html:option>
+				<html:option value="1">1</html:option>
+				<html:option value="2">2</html:option>
+				<html:option value="3">3</html:option>
+			</html:select>
+			<fmt:message key="label.authoring.advance.maximum.reply" />
+			<html:select property="forum.maximumReply" styleId="maximumReply">
+				<html:option value="0"><fmt:message key="label.authoring.advance.no.maximum"/></html:option>
+				<html:option value="1">1</html:option>
+				<html:option value="2">2</html:option>
+				<html:option value="3">3</html:option>
+			</html:select>
+		</td>
+	</tr>
+
+	<tr>
+		<td>
 			<html:checkbox property="forum.limitedInput" styleId="limitedInput">
 				<fmt:message key="label.authoring.advance.limited.input" />
 			</html:checkbox>
@@ -76,6 +113,24 @@
 					alert('<fmt:message key="js.error.title"/>\n'+errors);
 				
 			}
+			function allowNewTopic(){
+				var allowNew = document.getElementsByName("forum.allowNewTopic");
+				var min= document.getElementById("minimumReply");
+				var max= document.getElementById("maximumReply");
+				
+				//disable reply limited drop list
+				if(allowNew[0].checked){
+					min.disabled=true;
+					max.disabled=true;
+				}
+				//enable reply limited drop list
+				if(allowNew[1].checked){
+					min.disabled=false;
+					max.disabled=false;
+				}
+			}
+			allowNewTopic();
+			
 </script>