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

(fix) respect disabled state of sending rate-limiting (fixes #4198)

pull/237/head
Ludovic Marcotte 2017-07-04 09:57:05 -04:00
parent 919d1ef6be
commit 07fa202523
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SoObjects/SOGo/SOGoSystemDefaults.m
View File

@ -591,12 +591,26 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
//
- (int) maximumMessageSubmissionCount
{
return [self integerForKey: @"SOGoMaximumMessageSubmissionCount"];
NSUInteger v;
v = [self integerForKey: @"SOGoMaximumMessageSubmissionCount"];
if (!v)
return NSUIntegerMax;
return v;
}
- (int) maximumRecipientCount
{
return [self integerForKey: @"SOGoMaximumRecipientCount"];
NSUInteger v;
v = [self integerForKey: @"SOGoMaximumRecipientCount"];
if (!v)
return NSUIntegerMax;
return v;
}
- (int) maximumSubmissionInterval

2
UI/MailerUI/UIxMailEditor.m
View File

@ -816,7 +816,7 @@ static NSArray *infoKeys = nil;
SOGoSystemDefaults *dd;
id <WOActionResults> response;
int messages_count, recipients_count;
NSUInteger messages_count, recipients_count;
messageSubmissions = [[SOGoCache sharedCache] messageSubmissionsCountForLogin: [[context activeUser] login]];
dd = [SOGoSystemDefaults sharedSystemDefaults];