merge of '6d931b60fff0152bef4accc444201620045a9d87'

and '914b4e262396efbb440644e500c6fa43e8d23a61'

Monotone-Parent: 6d931b60fff0152bef4accc444201620045a9d87
Monotone-Parent: 914b4e262396efbb440644e500c6fa43e8d23a61
Monotone-Revision: 07531f86fd693076f1210ca5298d43ef1a2495bc

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-16T01:15:58
Monotone-Branch: ca.inverse.sogo

NEWS

@@ -28,6 +28,7 @@
   UID)
 - fixed week view alignment problem in IE7
 - fixed LDAP and SQL injection bugs
+- fixed many bugs related to the encoding and decoding of IMAP folder names
 
 1.0-20090407 (1.0.1)
 --------------------

UI/WebServerResources/MailerUI.js

@@ -39,6 +39,17 @@ var deleteMessageRequestCount = 0;
 
 var messageCheckTimer;
 
+/* We need to override this method since it is adapted to GCS-based folder
+	 references, which we do not use here */
+function URLForFolderID(folderID) {
+	var url = ApplicationBaseURL + encodeURI(folderID);
+
+	if (url[url.length-1] == '/')
+		url = url.substr(0, url.length-1);
+
+	return url;
+}
+
 /* mail list */
 
 function openMessageWindow(msguid, url) {

UI/WebServerResources/dtree.js

@@ -9,13 +9,18 @@
   | Updated: 17.04.2003                               |
   |--------------------------------------------------*/
 
+/* The content of attribute values should be quoted properly by using the
+   equivalent entities. */
 function dTreeQuote(str) {
     return (str
-            .replace(/\\/g, "\\\\")
+            .replace(/&/g, "&")
+            .replace(/</g, "&lt;")
             .replace(/\"/g, "&quot;")
             .replace(/\'/g, "&apos;"));
 }
 
+window.alert("test: " + dTreeQuote("& < \" ' \" &"));
+
 // Node object
 function Node(id, pid, name, isParent, url, dataname, datatype, title, target,
               icon, iconOpen, open, hasUnseen) {