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

See ChangeLog 

Monotone-Parent: b5d91e74f183ad54e2362119b25b4556f810e3b6
Monotone-Revision: fa6f3f2b467eaa14a01fb8a7dc2aee1e5e4191da

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-31T14:51:18
maint-2.0.2
Ludovic Marcotte 2012-05-31 14:51:18 +00:00
parent f2b455fffc
commit ed67384586
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -6,9 +6,12 @@
of attributes to SOPE.
* Added patch from bug #1608. This add many more password
schemes for SQL authentication.
* SoObject/Mailer/SOGoMailFolder.m (_readMailboxACL): we
* SoObject/Mailer/SOGoMailFolder.m (-_readMailboxACL): we
now create the mailbox if we are trying to read ACL of
a deleted mailbox.
* UI/MailerUI/UIxMailEditor.m (-personalContactInfos): we check
if the folder still exist and if the database isn't down
before performing any address books search operations.
2012-05-29 Francis Lachapelle <flachapelle@inverse.ca>

2
SoObjects/Mailer/SOGoMailFolder.m
View File

@ -1220,7 +1220,7 @@ static NSString *defaultUserID = @"anyone";
// If the mailbox doesn't exist, we create it. That could happen if
// a special mailbox (Drafts, Sent, Trash) is deleted from SOGo's web GUI
// or if any other mailbox is deleted behind SOGo's back.
if ([mailboxACL isKindOf: [NSException class]])
if ([mailboxACL isKindOfClass: [NSException class]])
{
[[self imap4Connection] createMailbox: [[self imap4Connection] imap4FolderNameForURL: [self imap4URL]]
atURL: [[self mailAccountFolder] imap4URL]];

6
UI/MailerUI/UIxMailEditor.m
View File

@ -422,8 +422,14 @@ static NSArray *infoKeys = nil;
folderContainer = (SOGoContactFolders *) [[[self clientObject] lookupUserFolder] privateContacts: @"Contacts"
inContext: nil];
folder = [folderContainer lookupPersonalFolder: @"personal" ignoringRights: YES];
// If the folder doesn't exist anymore or if the database is down, we
// return an empty array.
if ([folder isKindOfClass: [NSException class]])
return [NSArray array];
contactInfos = [folder lookupContactsWithFilter: nil
onCriteria: nil
sortBy: @"c_cn"