LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See ChangeLog 

Monotone-Parent: 3567e5aef4045091a835f8185e4f1ff94e748c78
Monotone-Revision: e43c9b00bdea42b8d8040a8c2bb1123e3a5230ec

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-08-11T18:29:05
maint-2.0.2
Ludovic Marcotte 2010-08-11 18:29:05 +00:00
parent 5c291627a4
commit 798076e6fa
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -11,7 +11,11 @@
equal to 1, we do NOT set it.
* UI/WebServerResources/UIxAclEditor.js
In addUserCallback(), we remove the owner of the
resource if it was added.
resource if it was added. This fixes #682.
* We now correctly encode/decode the '&'
character in the mailbox name when copying and moving
messages and also when opening mailboxes. This
fixes #716.
2010-08-03 Ludovic Marcotte <lmarcotte@inverse.ca>

4
SoObjects/SOGo/NSString+Utilities.m
View File

@ -263,12 +263,12 @@ static int cssEscapingCount;
int count;
strings = [NSArray arrayWithObjects: @"_U_", @"_D_", @"_H_", @"_A_", @"_S_",
@"_C_", @"_CO_", @"_SP_", @"_SQ_", nil];
@"_C_", @"_CO_", @"_SP_", @"_SQ_", @"_AM_", nil];
[strings retain];
cssEscapingStrings = [strings asPointersOfObjects];
characters = [NSArray arrayWithObjects: @"_", @".", @"#", @"@", @"*", @":",
@",", @" ", @"'", nil];
@",", @" ", @"'", @"&", nil];
cssEscapingCount = [strings count];
cssEscapingCharacters = NSZoneMalloc (NULL,
(cssEscapingCount + 1)

2
UI/MailerUI/UIxMailFolderActions.m
View File

@ -1,6 +1,6 @@
/* UIxMailFolderActions.m - this file is part of SOGo
*
* Copyright (C) 2007-2009 Inverse inc.
* Copyright (C) 2007-2010 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*

4
UI/WebServerResources/JavascriptAPIExtensions.js
View File

@ -60,8 +60,8 @@ String.prototype.asDate = function () {
};
String.prototype.asCSSIdentifier = function() {
var characters = [ '_' , '\\.', '#' , '@' , '\\*', ':' , ',' , ' ' , "'" ];
var escapeds = [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_', '_SP_', '_SQ_' ];
var characters = [ '_' , '\\.', '#' , '@' , '\\*', ':' , ',' , ' ' , "'", '&' ];
var escapeds = [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_', '_SP_', '_SQ_', '_AM_' ];
var newString = this;
for (var i = 0; i < characters.length; i++) {

5
UI/WebServerResources/MailerUI.js
View File

@ -551,7 +551,7 @@ function onMailboxMenuMove(event) {
deleteCachedMailbox(targetMailbox);
var url = ApplicationBaseURL + encodeURI(Mailer.currentMailbox) + "/moveMessages";
var parameters = "uid=" + uids.join(",") + "&folder=" + targetMailbox;
var parameters = "uid=" + uids.join(",") + "&folder=" + encodeURIComponent(targetMailbox);
var data = { "id": uids, "mailbox": Mailer.currentMailbox, "path": paths, "folder": targetMailbox, "refresh": true };
triggerAjaxRequest(url, folderRefreshCallback, data, parameters,
{ "Content-type": "application/x-www-form-urlencoded" });
@ -570,7 +570,6 @@ function onMailboxMenuCopy(event) {
targetMailbox = this.mailbox.fullName();
else // from DnD
targetMailbox = this.readAttribute("dataname");
for (var i = 0; i < rows.length; i++) {
var uid = rows[i].readAttribute("id").substr(4);
var path = Mailer.currentMailbox + "/" + uid;
@ -582,7 +581,7 @@ function onMailboxMenuCopy(event) {
deleteCachedMailbox(targetMailbox);
var url = ApplicationBaseURL + encodeURI(Mailer.currentMailbox) + "/copyMessages";
var parameters = "uid=" + uids.join(",") + "&folder=" + targetMailbox;
var parameters = "uid=" + uids.join(",") + "&folder=" + encodeURIComponent(targetMailbox);
var data = { "id": uids, "mailbox": Mailer.currentMailbox, "path": paths, "folder": targetMailbox, "refresh": false };
triggerAjaxRequest(url, folderRefreshCallback, data, parameters,
{ "Content-type": "application/x-www-form-urlencoded" });