[mms] Only count successful compose mails when determining recipient …

…limits (Bug #13751). Conflicts: imp/docs/CHANGES imp/package.xml
horde · Dec 20, 2014 · be99255 · be99255
1 parent 4069237
commit be99255
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -44,6 +44,14 @@ v7.0.0-git
       (Request #13227).
 
 
+------
+v6.2.5
+------
+
+[mms] Only count successful compose mails when determining recipient limits
+      (Bug #13751).
+
+
 ------
 v6.2.4
 ------

diff --git a/imp/lib/Sentmail/Mongo.php b/imp/lib/Sentmail/Mongo.php
@@ -145,6 +145,7 @@ public function favouriteRecipients($limit, $filter = null)
     public function numberOfRecipients($hours, $user = false)
     {
         $query = array(
+            self::SUCCESS => 1,
             self::TS => array(
                 '$gt' => (time() - ($hours * 3600))
             )

diff --git a/imp/lib/Sentmail/Sql.php b/imp/lib/Sentmail/Sql.php
@@ -103,8 +103,11 @@ public function favouriteRecipients($limit, $filter = null)
     public function numberOfRecipients($hours, $user = false)
     {
         /* Build the SQL query. */
-        $query = sprintf('SELECT COUNT(*) FROM %s WHERE sentmail_ts > ?',
-                         $this->_params['table']);
+        $query = sprintf(
+            'SELECT COUNT(*) FROM %s WHERE sentmail_ts > ? AND sentmail_success = 1',
+            $this->_params['table']
+        );
+
         if ($user) {
             $query .= sprintf(' AND sentmail_who = %s', $this->_db->quote($GLOBALS['registry']->getAuth()));
         }

diff --git a/imp/package.xml b/imp/package.xml
@@ -3699,5 +3699,18 @@
 * [mjr] Ensure we have a valid MIME part to display in thread view (Bug #13653).
    </notes>
   </release>
+  <release>
+   <version>
+    <release>6.2.5</release>
+    <api>6.2.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2014-12-03</date>
+   <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
+   <notes>
+* [mms] Only count successful compose mails when determining recipient limits (Bug #13751).
+   </notes>
+  </release>
  </changelog>
 </package>