merge of 'b5081fb240f719d3a1ce2583dff3738a9ceb9d93'

and 'f3553f7157471c92e062fbcc05707ec8f12c2df5'

Monotone-Parent: b5081fb240f719d3a1ce2583dff3738a9ceb9d93
Monotone-Parent: f3553f7157471c92e062fbcc05707ec8f12c2df5
Monotone-Revision: a91fdc0311ce32c507f4f0c447904b80ca61e876

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-09-29T14:36:59
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2008-09-29 14:36:59 +00:00
16 changed files with 42 additions and 44 deletions
+11 -8
View File
@@ -134,7 +134,7 @@
NSString *inboxName;
NSUserDefaults *ud;
WOResponse *response;
int quota;
float quota;
ud = [NSUserDefaults standardUserDefaults];
co = [self clientObject];
@@ -143,18 +143,21 @@
folders = [self _jsonFolders: rawFolders];
// Retrieve INBOX quota
quota = [ud integerForKey: @"SOGoSoftQuota"];
quota = [ud floatForKey: @"SOGoSoftQuotaRatio"];
inbox = [co inboxFolderInContext: context];
inboxName = [NSString stringWithFormat: @"/%@", [inbox relativeImap4Name]];
client = [[inbox imap4Connection] client];
infos = [[client getQuotaRoot: [inbox relativeImap4Name]] objectForKey: @"quotas"];
inboxQuota = [infos objectForKey: inboxName];
if (quota > 0 && inboxQuota != nil)
// A soft quota is imposed for all users
inboxQuota = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt: quota], @"maxQuota",
[inboxQuota objectForKey: @"usedSpace"], @"usedSpace",
nil];
if (quota != 0 && inboxQuota != nil)
{
// A soft quota ration is imposed for all users
quota = quota * [(NSNumber*)[inboxQuota objectForKey: @"maxQuota"] intValue];
inboxQuota = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithFloat: (long)(quota+0.5)], @"maxQuota",
[inboxQuota objectForKey: @"usedSpace"], @"usedSpace",
nil];
}
data = [NSDictionary dictionaryWithObjectsAndKeys: folders, @"mailboxes",
inboxQuota, @"quotas",
nil];