Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4 -r20550d731bc352d13962c705f72a2419bab9201a
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
@@ -135,6 +135,7 @@
 label.authoring.advance.allow.upload  =Allow learners to add attachments
 label.authoring.advance.allow.new.wiki.page  =Allow learners to create new wiki pages
 label.authoring.advance.allow.attach.image  =Allow learners to attach images
+label.authoring.advance.allow.insert.link  =Allow learners to insert links
 error.pageContent.required  =Page content cannot be blank.
 error.wikiTitle.required  =Wiki title can not be blank.
 label.default.user.name  =Instructor
Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4 -r20550d731bc352d13962c705f72a2419bab9201a
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
@@ -135,6 +135,7 @@
 label.authoring.advance.allow.upload  =Allow learners to add attachments
 label.authoring.advance.allow.new.wiki.page  =Allow learners to create new wiki pages
 label.authoring.advance.allow.attach.image  =Allow learners to attach images
+label.authoring.advance.allow.insert.link  =Allow learners to insert links
 error.pageContent.required  =Page content cannot be blank.
 error.wikiTitle.required  =Wiki title can not be blank.
 label.default.user.name  =Instructor
Index: lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql
===================================================================
diff -u -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4 -r20550d731bc352d13962c705f72a2419bab9201a
--- lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql	(.../create_lams_tool_wiki.sql)	(revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
+++ lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql	(.../create_lams_tool_wiki.sql)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
@@ -38,6 +38,7 @@
    allow_rich_editor smallint,
    allow_new_wiki_page smallint,
    allow_attach_image smallint,
+   allow_insert_link smallint,
    allow_upload smallint, 
    maximum_reply integer, 
    minimum_reply integer,
@@ -120,8 +121,8 @@
 
 
 INSERT INTO tl_lawiki10_wiki (uid,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_wiki_page,allow_attach_image,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,reflect_on_activity) 
-VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,1,0,1,1,0,1,0,1,5000,0);
+ allow_new_wiki_page,allow_attach_image,allow_insert_link,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,reflect_on_activity) 
+VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,1,0,1,1,0,0,1,0,1,5000,0);
 
 INSERT INTO `tl_lawiki10_message` (`uid`, `create_date`, `last_reply_date`, `update_date`, `create_by`, `modified_by`, `subject`, `body`, `is_authored`, `is_anonymous`, `wiki_session_uid`, `parent_uid`, `wiki_uid`, `reply_number`, `hide_flag`, `report_id`) VALUES 
   (1,NOW(),NOW(),NOW(),null,null,'Wiki Page','Wiki content',1,0,NULL,NULL,1,0,0,NULL);
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java
===================================================================
diff -u -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4 -r20550d731bc352d13962c705f72a2419bab9201a
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java	(.../Wiki.java)	(revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java	(.../Wiki.java)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
@@ -59,6 +59,7 @@
 	private boolean allowEdit;
 	private boolean allowNewWikiPage;
 	private boolean allowAttachImage;
+	private boolean allowInsertLink;
 	private boolean allowUpload;
 	private int maximumReply;
 	private int minimumReply;
@@ -502,6 +503,16 @@
 		this.allowAttachImage = allowAttachImage;
 	}
 	/**
+	 * @hibernate.property column="allow_insert_link"
+	 * @return
+	 */	
+	public boolean isAllowInsertLink() {
+		return allowInsertLink;
+	}
+	public void setAllowInsertLink(boolean allowInsertLink) {
+		this.allowInsertLink = allowInsertLink;
+	}
+	/**
 	 * @hibernate.property column="allow_upload"
 	 * @return
 	 */
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4 -r20550d731bc352d13962c705f72a2419bab9201a
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
@@ -912,7 +912,8 @@
 	    	toolContentObj.setAllowAnonym(Boolean.FALSE);
 	    	toolContentObj.setAllowEdit(Boolean.TRUE); // this is the default value
 	    	toolContentObj.setAllowNewWikiPage(Boolean.FALSE); // this is the default value
-	    	toolContentObj.setAllowAttachImage(Boolean.TRUE);
+	    	toolContentObj.setAllowAttachImage(Boolean.TRUE); // this is the default value
+	    	toolContentObj.setAllowInsertLink(Boolean.FALSE); // this is the default value
 	    	//toolContentObj.setAllowRichEditor(Boolean.FALSE);
 	    	toolContentObj.setAllowUpload(Boolean.TRUE); // this is the default value
 	    	toolContentObj.setContentId(toolContentId);
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
diff -u -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4 -r20550d731bc352d13962c705f72a2419bab9201a
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	(.../WikiConstants.java)	(revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	(.../WikiConstants.java)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
@@ -63,6 +63,7 @@
 	public static final String ATTR_ALLOW_UPLOAD = "allowUpload";
 	public static final String ATTR_ALLOW_NEW_WIKI_PAGES = "allowNewWikiPages";
 	public static final String ATTR_ALLOW_ATTACH_IMAGES = "allowAttachImages";
+	public static final String ATTR_ALLOW_INSERT_LINKS = "allowInsertLinks";
 	public static final String ATTR_ALLOW_RICH_EDITOR = "allowRichEditor";
 	public static final String ATTR_LIMITED_CHARS = "limitedChars";
 
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
diff -u -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4 -r20550d731bc352d13962c705f72a2419bab9201a
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
@@ -233,6 +233,7 @@
 		sessionMap.put(WikiConstants.ATTR_ALLOW_UPLOAD,wiki.isAllowUpload());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_NEW_WIKI_PAGES,wiki.isAllowNewWikiPage());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_ATTACH_IMAGES,wiki.isAllowAttachImage());
+		sessionMap.put(WikiConstants.ATTR_ALLOW_INSERT_LINKS,wiki.isAllowInsertLink());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_RICH_EDITOR,allowRichEditor);
 		sessionMap.put(WikiConstants.ATTR_LIMITED_CHARS,new Integer(allowNumber));
 		sessionMap.put(WikiConstants.ATTR_REFLECTION_ON,wiki.isReflectOnActivity());
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java
===================================================================
diff -u -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4 -r20550d731bc352d13962c705f72a2419bab9201a
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java	(.../WikiForm.java)	(revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java	(.../WikiForm.java)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
@@ -118,6 +118,7 @@
     	wiki.setLockWhenFinished(false);
     	wiki.setAllowNewWikiPage(false);
     	wiki.setAllowAttachImage(false);
+    	wiki.setAllowInsertLink(false);
     	wiki.setAllowUpload(false);
     	wiki.setReflectOnActivity(false);
     }
Index: lams_tool_wiki_orig/web/jsps/authoring/advance.jsp
===================================================================
diff -u -rbde9cc9b282f974aeb3fb19a0c54db82a52566e4 -r20550d731bc352d13962c705f72a2419bab9201a
--- lams_tool_wiki_orig/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision bde9cc9b282f974aeb3fb19a0c54db82a52566e4)
+++ lams_tool_wiki_orig/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
@@ -32,6 +32,16 @@
 </p>
 
 <p>
+	<html:checkbox property="wiki.allowInsertLink" styleClass="noBorder"
+		styleId="allowInsertLink">
+	</html:checkbox>
+	<label for="allowInsertLink">
+		<fmt:message key="label.authoring.advance.allow.insert.link" />
+	</label>
+</p>
+
+
+<p>
 	<html:checkbox property="wiki.allowEdit" styleClass="noBorder"
 		styleId="allowEdit">
 	</html:checkbox>
Index: lams_tool_wiki_orig/web/jsps/learning/message/bodyarea.jsp
===================================================================
diff -u -r1e131f532456c075126b0bb76ecc385f19ff98cf -r20550d731bc352d13962c705f72a2419bab9201a
--- lams_tool_wiki_orig/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
+++ lams_tool_wiki_orig/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
@@ -1,10 +1,11 @@
 <%@ include file="/includes/taglibs.jsp"%>
+<%@ include file="../toolbarButtons.jsp"%>
 
-<div>
+<div id="fckbox" style="visibility: hidden">
 	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 	<lams:FCKEditor id="message.body"
 			value="${formBean.message.body}"
-			toolbarSet="Default-Learner"></lams:FCKEditor>
+			toolbarSet="Custom-Learner"></lams:FCKEditor>
 <BR>
 <html:errors property="message.body" />
 
Index: lams_tool_wiki_orig/web/jsps/learning/toolbarButtons.jsp
===================================================================
diff -u
--- lams_tool_wiki_orig/web/jsps/learning/toolbarButtons.jsp	(revision 0)
+++ lams_tool_wiki_orig/web/jsps/learning/toolbarButtons.jsp	(revision 20550d731bc352d13962c705f72a2419bab9201a)
@@ -0,0 +1,19 @@
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
+<script type="text/javascript">
+	function hideToolbarItem(editorInstance, itemName) {
+		toolbarItem = editorInstance.EditorWindow.parent.FCKToolbarItems.LoadedItems[itemName]._UIButton.MainElement;
+		toolbarItem.style.display = 'none';
+	}
+	
+	function FCKeditor_OnComplete(editorInstance) 
+	{ 	
+		if (!${sessionMap.allowAttachImages}) {	
+			hideToolbarItem(editorInstance, 'Image');
+		}
+		if (!${sessionMap.allowInsertLinks}) {	
+			hideToolbarItem(editorInstance, 'Link');
+		}
+		document.getElementById("fckbox").style.visibility = 'visible';
+	}
+</script>
\ No newline at end of file