parent
6b3a3f858b
commit
7f7e3cb06a
1
NEWS
1
NEWS
|
@ -9,6 +9,7 @@ Enhancements
|
|||
Bug fixes
|
||||
- better handling of empty "Flag" messages over ActiveSync (#2806)
|
||||
- fixed Chinese charset handling (#2809)
|
||||
- fixed folder name (calendars and contacts) of new subscriptions (#2801)
|
||||
|
||||
2.2.5 (2014-06-05)
|
||||
------------------
|
||||
|
|
|
@ -364,8 +364,7 @@
|
|||
|
||||
// We sort our array - this is pretty useful for the Web
|
||||
// interface of SOGo.
|
||||
allUsers = [users
|
||||
sortedArrayUsingSelector: @selector (caseInsensitiveDisplayNameCompare:)];
|
||||
allUsers = [users sortedArrayUsingSelector: @selector (caseInsensitiveDisplayNameCompare:)];
|
||||
|
||||
max = [allUsers count];
|
||||
jsonResponse = [NSMutableArray arrayWithCapacity: max];
|
||||
|
@ -462,8 +461,7 @@
|
|||
|
||||
folderType = [self queryParameterForKey: @"type"];
|
||||
userFolder = [self clientObject];
|
||||
folders
|
||||
= [userFolder foldersOfType: folderType
|
||||
folders = [userFolder foldersOfType: folderType
|
||||
forUID: [userFolder ownerInContext: context]];
|
||||
result = [self _foldersResponseForResults: folders];
|
||||
|
||||
|
|
|
@ -193,13 +193,8 @@ function addFolderBranchToTree(tree, user, folder, nodeId, subId, isLast) {
|
|||
icon += 'calendar-folder-16x16.png';
|
||||
var folderId = user + ":" + folderInfos[1].substr(1);
|
||||
|
||||
// name has the format "Foldername (Firstname Lastname <email>)"
|
||||
// We sanitize the value to avoid XSS issues
|
||||
var name = folderInfos[0].escapeHTML();
|
||||
|
||||
var pos = name.lastIndexOf(' (');
|
||||
if (pos > -1)
|
||||
name = name.substring(0, pos); // strip the part with fullname and email
|
||||
var node = new dTreeNode(subId, nodeId, name, 0, '#', folderId,
|
||||
folderInfos[2] + '-folder', '', '', icon, icon);
|
||||
node._ls = isLast;
|
||||
|
@ -223,25 +218,19 @@ function onConfirmFolderSelection(event) {
|
|||
var node = topNode.selectedEntry.parentNode;
|
||||
var folder = node.getAttribute("dataname");
|
||||
var type = node.getAttribute("datatype");
|
||||
|
||||
var folderName;
|
||||
if (window.opener.userFolderType == "user") {
|
||||
var span = $(topNode.selectedEntry).down("SPAN.nodeName");
|
||||
var email = (span.innerHTML
|
||||
var resource = $(topNode.selectedEntry).down("SPAN.nodeName");
|
||||
var description = (resource.innerHTML
|
||||
.replace("<", "<", "g")
|
||||
.replace(">", ">", "g"));
|
||||
folderName = email.replace(/>,.*$/, ">", "g");
|
||||
folderName = description.replace(/>,.*$/, ">", "g");
|
||||
}
|
||||
else {
|
||||
var resource = $(topNode.selectedEntry).down("SPAN.nodeName");
|
||||
var user = $(node.parentNode.previousSibling).down("SPAN.nodeName");
|
||||
var email = (user.innerHTML
|
||||
.replace("<", "<", "g")
|
||||
.replace(">", ">", "g"));
|
||||
folderName = resource.innerHTML;
|
||||
folderName = folderName.replace(/>,.*(\))?$/, ">)$1", "g");
|
||||
}
|
||||
|
||||
var data = { folderName: folderName, folder: folder, type: type, window: window };
|
||||
if (parent$(accessToSubscribedFolder(folder)))
|
||||
window.alert(_("You have already subscribed to that folder!"));
|
||||
|
|
Loading…
Reference in New Issue