Index: lams_tool_wiki/db/sql/create_lams_tool_wiki.sql
===================================================================
diff -u -r8bc1db678a8e2a49d1f73ec2ad34ee1c26ab8d93 -re3b4354d83bbeff0b953d1fce2bc3be6323c0b50
--- lams_tool_wiki/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision 8bc1db678a8e2a49d1f73ec2ad34ee1c26ab8d93)
+++ lams_tool_wiki/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision e3b4354d83bbeff0b953d1fce2bc3be6323c0b50)
@@ -11,8 +11,22 @@
create table tl_lawiki10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), wiki_uid bigint, wiki_main_page_uid bigint, content_folder_id varchar(255), primary key (uid))TYPE=InnoDB;
create table tl_lawiki10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, wiki_session_uid bigint, entry_uid bigint, wiki_edits integer, primary key (uid))TYPE=InnoDB;
create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_learner_create_pages bit, allow_learner_insert_links bit, allow_learner_attach_images bit, notify_updates bit, reflect_on_activity bit, reflect_instructions text, minimum_edits integer, maximum_edits integer, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, wiki_main_page_uid bigint, primary key (uid))TYPE=InnoDB;
-create table tl_lawiki10_wiki_page (uid bigint not null auto_increment, wiki_uid bigint, title varchar(255), editable bit, wiki_current_content bigint, added_by bigint, wiki_session_uid bigint, primary key (uid), unique key (title, wiki_session_uid))TYPE=InnoDB;
+create table tl_lawiki10_wiki_page (
+ uid bigint not null auto_increment,
+ wiki_uid bigint,
+ title varchar(255),
+ editable bit,
+ wiki_current_content bigint,
+ added_by bigint,
+ wiki_session_uid bigint,
+ primary key (uid),
+ unique key UK9406D87760B3B03B (wiki_uid, title, wiki_session_uid)
+)TYPE=InnoDB;
+
create table tl_lawiki10_wiki_page_content (uid bigint not null auto_increment, wiki_page_uid bigint, body text, editor bigint, edit_date datetime, version bigint, primary key (uid))TYPE=InnoDB;
+
+
+
alter table tl_lawiki10_attachment add index FK9406D87760B3B03B (wiki_uid), add constraint FK9406D87760B3B03B foreign key (wiki_uid) references tl_lawiki10_wiki (uid);
alter table tl_lawiki10_session add index FKF01D63C260B3B03B (wiki_uid), add constraint FKF01D63C260B3B03B foreign key (wiki_uid) references tl_lawiki10_wiki (uid);
alter table tl_lawiki10_session add index FKF01D63C2A3FF7EC0 (wiki_main_page_uid), add constraint FKF01D63C2A3FF7EC0 foreign key (wiki_main_page_uid) references tl_lawiki10_wiki_page (uid);
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
===================================================================
diff -u -r8d32e52903d230f8018ac609041934db7f180e73 -re3b4354d83bbeff0b953d1fce2bc3be6323c0b50
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql (.../patch20090121_updateFrom22.sql) (revision 8d32e52903d230f8018ac609041934db7f180e73)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql (.../patch20090121_updateFrom22.sql) (revision e3b4354d83bbeff0b953d1fce2bc3be6323c0b50)
@@ -7,6 +7,31 @@
UPDATE lams_tool SET pedagogical_planner_url='tool/lawiki10/pedagogicalPlanner.do' WHERE tool_signature='lawiki10';
+SET FOREIGN_KEY_CHECKS=0;
+drop table if exists tl_lawiki10_wiki_page_temp;
+create table tl_lawiki10_wiki_page_temp (
+ uid bigint not null auto_increment,
+ wiki_uid bigint,
+ title varchar(255),
+ editable bit,
+ wiki_current_content bigint,
+ added_by bigint,
+ wiki_session_uid bigint,
+ primary key (uid),
+ unique key UK9406D87760B3B03B (wiki_uid, title, wiki_session_uid)
+)TYPE=InnoDB;
+
+INSERT INTO tl_lawiki10_wiki_page_temp SELECT * from tl_lawiki10_wiki_page;
+drop table if exists tl_lawiki10_wiki_page;
+COMMIT;
+rename table tl_lawiki10_wiki_page_temp to tl_lawiki10_wiki_page;
+alter table tl_lawiki10_wiki_page add index FK961AFFEAD111111 (wiki_session_uid), add constraint FK961AFFEAD8004954 foreign key (wiki_session_uid) references tl_lawiki10_session (uid);
+alter table tl_lawiki10_wiki_page add index FK961AFFEA6111111 (wiki_uid), add constraint FK961AFFEA60B3B03B foreign key (wiki_uid) references tl_lawiki10_wiki (uid);
+alter table tl_lawiki10_wiki_page add index FK961AFFEA3111111 (added_by), add constraint FK961AFFEA36CBA7DB foreign key (added_by) references tl_lawiki10_user (uid);
+alter table tl_lawiki10_wiki_page add index FK961AFFEAE111111 (wiki_current_content), add constraint FK961AFFEAE48332B4 foreign key (wiki_current_content) references tl_lawiki10_wiki_page_content (uid);
+
+SET FOREIGN_KEY_CHECKS=1;
+
----------------------Put all sql statements above here-------------------------
-- If there were no errors, commit and restore autocommit to on
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiPageContentDTO.java
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -re3b4354d83bbeff0b953d1fce2bc3be6323c0b50
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiPageContentDTO.java (.../WikiPageContentDTO.java) (revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiPageContentDTO.java (.../WikiPageContentDTO.java) (revision e3b4354d83bbeff0b953d1fce2bc3be6323c0b50)
@@ -17,7 +17,7 @@
public WikiPageContentDTO(WikiPageContent pageContent) {
this.uid = pageContent.getUid();
- this.body = pageContent.getBody();
+ this.body = pageContent.getBody().trim();
this.editDate = pageContent.getEditDate();
this.version = pageContent.getVersion();
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiPageDTO.java
===================================================================
diff -u -r98272e08314f1487800201921390914652849147 -re3b4354d83bbeff0b953d1fce2bc3be6323c0b50
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiPageDTO.java (.../WikiPageDTO.java) (revision 98272e08314f1487800201921390914652849147)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiPageDTO.java (.../WikiPageDTO.java) (revision e3b4354d83bbeff0b953d1fce2bc3be6323c0b50)
@@ -15,7 +15,7 @@
public WikiPageDTO(WikiPage wikiPage) {
this.uid = wikiPage.getUid();
- this.title = wikiPage.getTitle();
+ this.title = wikiPage.getTitle().trim();
this.editable = wikiPage.getEditable();
this.currentWikiContentDTO = new WikiPageContentDTO(wikiPage.getCurrentWikiContent());
this.javaScriptTitle = this.javaScriptEscape(wikiPage.getTitle());
@@ -67,8 +67,10 @@
public String javaScriptEscape(String string)
{
+
+ String replaced = string.replaceAll("\n", "").replaceAll("\'", "`").replaceAll("\"","\\"");;
//return string.replaceAll("\'", "\\\\'").replaceAll("\"","\\\\\"");
- return string.replaceAll("\'", "`").replaceAll("\"","\\"");
+ return replaced;
}
}
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d -re3b4354d83bbeff0b953d1fce2bc3be6323c0b50
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision e3b4354d83bbeff0b953d1fce2bc3be6323c0b50)
@@ -399,6 +399,13 @@
// reset it to new toolContentId
wiki.setToolContentId(toolContentId);
wiki.setCreateBy(new Long(newUserUid.longValue()));
+
+ // Making sure the wiki titles do not have trailing newline characters
+ for (WikiPage wikiPage : wiki.getWikiPages()) {
+ String title = wikiPage.getTitle();
+ title = title.replaceAll("\n", "").replaceAll("\r", "").replaceAll("\t", "");
+ wikiPage.setTitle(title);
+ }
insertUnsavedWikiContent(wiki);
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
===================================================================
diff -u -r97e1558109fe168cc0f6575e5753fa8493e9e351 -re3b4354d83bbeff0b953d1fce2bc3be6323c0b50
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java (.../WikiPageAction.java) (revision 97e1558109fe168cc0f6575e5753fa8493e9e351)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java (.../WikiPageAction.java) (revision e3b4354d83bbeff0b953d1fce2bc3be6323c0b50)
@@ -115,7 +115,7 @@
WikiPage currentPage = wikiService.getWikiPageByUid(currentPageUid);
// Check if the content is different
- if (!currentPage.getCurrentWikiContent().getBody().equals(wikiForm.getWikiBody())) {
+ if (!currentPage.getCurrentWikiContent().getBody().equals(wikiForm.getWikiBody()) || !currentPage.getTitle().equals(wikiForm.getTitle())) {
// Set up the wiki user if this is a tool session (learner)
// Also set the editable flag here
Index: lams_tool_wiki/web/WEB-INF/web.xml
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -re3b4354d83bbeff0b953d1fce2bc3be6323c0b50
--- lams_tool_wiki/web/WEB-INF/web.xml (.../web.xml) (revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_tool_wiki/web/WEB-INF/web.xml (.../web.xml) (revision e3b4354d83bbeff0b953d1fce2bc3be6323c0b50)
@@ -18,7 +18,7 @@
parentContextKey
- context.tool
+ context.central
Index: lams_tool_wiki/web/includes/javascript/wikiCommon.js
===================================================================
diff -u -r40fb72d3289330a49552817cf29d032ba4e203a1 -re3b4354d83bbeff0b953d1fce2bc3be6323c0b50
--- lams_tool_wiki/web/includes/javascript/wikiCommon.js (.../wikiCommon.js) (revision 40fb72d3289330a49552817cf29d032ba4e203a1)
+++ lams_tool_wiki/web/includes/javascript/wikiCommon.js (.../wikiCommon.js) (revision e3b4354d83bbeff0b953d1fce2bc3be6323c0b50)
@@ -39,7 +39,11 @@
function trim(str)
{
- return str.replace(/^\s+|\s+$/g, '');
+ var regX1 = /\n/gi;
+ var regX2 = /\t/gi;
+ str = new String(str);
+ str = str.replace(/^\s+|\s+$/g, '').replace(regX1, "").replace(regX2, "");
+ return str;
}
function doRemove(confirmMessage)
Index: lams_tool_wiki/web/login.jsp
===================================================================
diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -re3b4354d83bbeff0b953d1fce2bc3be6323c0b50
--- lams_tool_wiki/web/login.jsp (.../login.jsp) (revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7)
+++ lams_tool_wiki/web/login.jsp (.../login.jsp) (revision e3b4354d83bbeff0b953d1fce2bc3be6323c0b50)
@@ -4,14 +4,13 @@
<%@ page import="org.lamsfoundation.lams.security.JspRedirectStrategy" %>
-gyig
+
<%
if(true)
{
return;
}
%>
-fufy