From 08ab36244c1b7e4144f06948fb4c981540032248 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Mon, 16 Dec 2013 17:48:23 -0500
Subject: [PATCH] Improved the logic behind refusing too-many submitted mails.

---
 UI/MailerUI/UIxMailEditor.m | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index 3eb7878b8..fe60f39d3 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -714,25 +714,24 @@ static NSArray *infoKeys = nil;
       recipients_count =  [[messageSubmissions objectForKey: @"RecipientsCount"] intValue];
       
       if ((messages_count >= [dd maximumMessageSubmissionCount] || recipients_count >= [dd maximumRecipientCount]) &&
-          delta >= [dd maximumSubmissionInterval] &&
-          delta <= block_time )
+          delta <= block_time)
         {
           jsonResponse = [NSDictionary dictionaryWithObjectsAndKeys:
                                          @"failure", @"status",
-                                       [self labelForKey: @"Tried to send too many mails. Please wait."],
+                                                  [self labelForKey: @"Tried to send too many mails. Please wait."],
                                        @"message",
                                        nil];
           return [self responseWithStatus: 200
                                 andString: [jsonResponse jsonRepresentation]];
         }
       
-      if (delta > block_time)
+      if (delta > block_time ||
+          (delta >= [dd maximumSubmissionInterval] && messages_count < [dd maximumMessageSubmissionCount] && recipients_count < [dd maximumRecipientCount]))
         {
           [[SOGoCache sharedCache] setMessageSubmissionsCount: 0
                                               recipientsCount: 0
                                                      forLogin: [[context activeUser] login]];
         }
-
     }
 
   co = [self clientObject];