amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-16 10:48:50 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: 60ea6e18203007e12287f19ec553de192b334dd6
Monotone-Revision: 4a2acb99fffd2f82c148ae17571304c2d05b9fba

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-05-05T18:34:13
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2011-05-05 18:34:13 +00:00
parent c9a69a76a7
commit f78bdb7150
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2011-05-05 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/MailerUI/UIxMailAccountActions.m - fixed an issue
with namespace handling in Dovecot. We do not try
to swap the mailbox name, which can correspond to an
username if we are dealing with the top-level mailbox.
2011-05-03 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/generic.js (onRowClick): in some cases

31
UI/MailerUI/UIxMailAccountActions.m
View File

@@ -133,18 +133,29 @@
// to the full name of the person.
if (otherUsersFolderName && [currentFolder hasPrefix: otherUsersFolderName])
{
// We have a string like /Other Users/lmarcotte/...
// We have a string like /Other Users/lmarcotte/... under Cyrus, but we could
// also have something like /shared under Dovecot. So we swap the username only
// if we have one, of course.
pathComponents = [NSMutableArray arrayWithArray: [currentFolder pathComponents]];
login = [pathComponents objectAtIndex: 2];
userManager = [SOGoUserManager sharedUserManager];
fullName = [userManager getCNForUID: login];
[pathComponents removeObjectsInRange: NSMakeRange(0,3)];
currentDisplayName = [NSString stringWithFormat: @"/%@/%@/%@",
[self labelForKey: @"OtherUsersFolderName"],
(fullName != nil ? fullName : login),
[pathComponents componentsJoinedByString: @"/"]];
if ([pathComponents count] > 2)
{
login = [pathComponents objectAtIndex: 2];
userManager = [SOGoUserManager sharedUserManager];
fullName = [userManager getCNForUID: login];
[pathComponents removeObjectsInRange: NSMakeRange(0,3)];
currentDisplayName = [NSString stringWithFormat: @"/%@/%@/%@",
[self labelForKey: @"OtherUsersFolderName"],
(fullName != nil ? fullName : login),
[pathComponents componentsJoinedByString: @"/"]];
}
else
{
currentDisplayName = [NSString stringWithFormat: @"/%@%@", [self labelForKey: @"OtherUsersFolderName"],
[currentFolder substringFromIndex: [otherUsersFolderName length]]];
}
}
else if (sharedFoldersName && [currentFolder hasPrefix: sharedFoldersName])
currentDisplayName = [NSString stringWithFormat: @"/%@%@", [self labelForKey: @"SharedFoldersName"],