From b66fbf56138ea9dacb9d968ad638c6c889441e77 Mon Sep 17 00:00:00 2001
From: Simon Buckle <bounce@alfresco.com>
Date: Thu, 28 Aug 2008 14:52:20 +0000
Subject: [PATCH] Fixed encoding issue. Fixed problem with string conversion
 for page rename function in the wiki.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/slingshot/wiki/lib/wiki.lib.js   |  7 +++--
 .../org/alfresco/slingshot/wiki/move.post.js  | 26 +++++++++----------
 .../slingshot/wiki/move.post.json.ftl         |  3 ++-
 .../alfresco/slingshot/wiki/page.get.json.ftl |  4 ++-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/lib/wiki.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/lib/wiki.lib.js
index 45928fad6b..43a80ff8f7 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/lib/wiki.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/lib/wiki.lib.js
@@ -52,10 +52,9 @@ function createWikiPage(name, folder, options)
 	page.tags = [];
 	
 	// Set cm:title
-	page.properties["cm:title"] = name.replace(/_/g, " ");
-	
-	// TODO: sort out appropriate permission(s)
-	page.save();	
+	page.properties["cm:title"] = new String(name).replace(/_/g, " ");
+	page.save();
+		
 	return page;
 }
 
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js
index 4baf7e1381..f85801f136 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js
@@ -17,8 +17,9 @@ function main()
 		return jsonError("No new name property specified");
 	}
 	// Remove any whitespace and replace with "_"
-	var newName = String(json.get("name")).replace(/\\s+/g, "_");
-
+	var newName = new String(json.get("name"));
+   newName = newName.replace(/\s+/g, "_");
+   
 	var params = getTemplateArgs(["siteId", "pageTitle"]);
 	
 	// Get the site
@@ -43,19 +44,16 @@ function main()
 	// Finally, now we can do what we are supposed to do
 	try 
 	{
-		var currentName = page.name;
-		page.name = newName;
-		page.save();
-
-/**		
-		var link = wiki.createNode(currentName, "cm:link");
-		link.properties["cm:destination"] = page.nodeRef;
-		link.save();
-**/		
-		var placeholder = createWikiPage(currentName, wiki, {
-			content: "This page has been moved [["  + newName + "|here]]."
-		});
+      var currentName = page.name;	
 		
+		page.name = newName;
+		page.properties["cm:title"] = new String(newName).replace(/_/g, " ");
+		page.save();
+		
+		var placeholder = createWikiPage(currentName, wiki, {
+   	   content: "This page has been moved [["  + newName + "|here]]."
+   	});
+   		
 	   var d = {
 		   currentName: newName,
 		   previousName: currentName,
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.json.ftl
index 49bb54c532..f84196703e 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.json.ftl
@@ -1,8 +1,9 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
 {
 <#if result.error?exists>
 	"error" : "${result.error}"
 <#else>
 	"name" : "${result.name}"
 </#if>
-
 }
+</#escape>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl
index 6e4da50fd0..a4d3c15534 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl
@@ -1,3 +1,4 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
 {
 <#if result.page??>
 <#assign page = result.page>
@@ -30,4 +31,5 @@
 <#else>
    "error" : "${result.error!""}"
 </#if>
-}
\ No newline at end of file
+}
+</#escape>
\ No newline at end of file