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

Alinto · Jul 4, 2017 · 07fa202 · 07fa202
1 parent 919d1ef
commit 07fa202
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -591,12 +591,26 @@ - (int) maximumMessageSizeLimit
 //
 - (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

diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
@@ -816,7 +816,7 @@ - (WOResponse *) sendAction
   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];