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

(fix) more safeguards when expunging mailboxes with no quota

pull/186/head
Ludovic Marcotte 2016-01-12 16:02:10 -05:00
parent d2f164dfb7
commit de47df7c76
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
UI/MailerUI/UIxMailFolderActions.m
View File

@ -317,9 +317,7 @@
{
// When not using a trash folder, return the quota
account = [co mailAccountFolder];
quota = [account getInboxQuota];
if (quota)
if ((quota = [account getInboxQuota]))
{
data = [NSDictionary dictionaryWithObjectsAndKeys: quota, @"quotas", nil];
response = [self responseWithStatus: 200
@ -436,9 +434,7 @@
{
// We return the inbox quota
account = [co mailAccountFolder];
quota = [account getInboxQuota];
if (quota)
if ((quota = [account getInboxQuota]))
{
data = [NSDictionary dictionaryWithObject: quota forKey: @"quotas"];
response = [self responseWithStatus: 200 andJSONRepresentation: data];
@ -637,11 +633,13 @@
- (WOResponse *) expungeAction
{
NSException *error;
SOGoTrashFolder *co;
SOGoMailAccount *account;
NSDictionary *data;
WOResponse *response;
SOGoTrashFolder *co;
NSException *error;
NSDictionary *data;
id quota;
co = [self clientObject];
@ -658,8 +656,13 @@
// We return the inbox quota
account = [co mailAccountFolder];
data = [NSDictionary dictionaryWithObject: [account getInboxQuota] forKey: @"quotas"];
response = [self responseWithStatus: 200 andJSONRepresentation: data];
if ((quota = [account getInboxQuota]))
{
data = [NSDictionary dictionaryWithObject: quota forKey: @"quotas"];
response = [self responseWithStatus: 200 andJSONRepresentation: data];
}
else
response = [self responseWithStatus: 200];
}
return response;