Monotone-Parent: 87a9edec020f812d113ea5bde21c2d30b040ab87

Monotone-Revision: c00d2fadae3d5733fb53c91e14b43a56d1e1ca58

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-11T19:55:13
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/UIxContactsUserFolders.js

@@ -94,9 +94,9 @@ function onUserNodeToggle(event) {
 	this.stopObserving("click", onUserNodeToggle);
 
 	var person = this.parentNode.getAttribute("dataname");
-	var url = (UserFolderURL + "foldersSearch"
-						 + "?user=" + escape(person)
-						 + "&type=" + window.opener.userFolderType);
+	
+	var url = (UserFolderURLForUser(person) + "foldersSearch"
+						 + "?type=" + window.opener.userFolderType);
 	var nodeId = this.getAttribute("id").substr(3);
 	triggerAjaxRequest(url, foldersSearchCallback,
 										 { nodeId: nodeId, user: person });

UI/WebServerResources/generic.js

@@ -352,9 +352,7 @@ function getContrastingTextColor(bgColor) {
 
 	// Consider all colors with less than 56% brightness as dark colors and
 	// use white as the foreground color, otherwise use black.
-	return ((brightness < 144)
-					? "white"
-					: "black");
+	return ((brightness < 144) ? "white" : "black");
 }
 
 function triggerAjaxRequest(url, callback, userdata, content, headers) {
@@ -1615,6 +1613,19 @@ function configureLinkBanner() {
 	}
 }
 
+/* accessing another user's data */
+function UserFolderURLForUser(user) {
+	var folderArray = UserFolderURL.split("/");
+	var count;
+	if (UserFolderURL.endsWith('/'))
+		count = folderArray.length - 2;
+	else
+		count = folderArray.length - 1;
+	folderArray[count] = escape(user);
+
+	return folderArray.join("/");
+}
+
 /* folder creation */
 function createFolder(name, okCB, notOkCB) {
 	if (name) {