Ticket #238: inpatch.patch

cache.php

@@ -227 +227 @@
       $reported = 0;
       $deleted = 0;
       $rescued = 0;
+      
+      $ham_list = array();
+      $spam_list = array();
+      $delete_list = array();
+      
       global $_POST, $lang, $logger;
       $items = $_POST['cache_item'];
       foreach ($items as $type => $mail_item) {
@@ -240 +245 @@
           if ($newtype == "spam") {
             switch ($this->type) {
               case 'ham':
-                // Mark the item as Confirmed Spam
-                $update = "UPDATE maia_mail_recipients SET type = 'C' " .
-                          "WHERE recipient_id = ? AND mail_id = ?";
-                $this->dbh->query($update, array($euid, $mail_id));
+                // Mark the item as false negative.   It will also be marked as confirmed.               
                 record_mail_stats($euid, $mail_id, "fn");
                 $reported++;
                 break;
-              case 'spam':
-                confirm_spam($euid, $mail_id);
+              default:
                 $confirmed++;
-              default:
             }
+            array_push($spam_list, $mail_id);
+            
           //send item
           } elseif ($newtype == "ham") {
             switch ($this->type) {
               case 'ham':
-              $logger->debug('confirming ' . $mail_id . ' as ham');
-                confirm_ham($euid, $mail_id);
+                  array_push($ham_list, $mail_id);
                 $confirmed++;
                 break;
               default:
-                $result = rescue_item($euid, $mail_id);
+                $result = rescue_item($euid, $mail_id); // done individually because of mail delivery
                 if (strncmp($result, "2", 1) == 0) {
                   $rescued++;
                 } else {
@@ -270 +271 @@
             }              
           //delete item.
           } elseif ($newtype == "delete") {
-              $logger->debug('deleting ' . $mail_id);
-
-          delete_mail_reference($euid, $mail_id);
+              array_push($delete_list, $mail_id);
               $deleted++;
           }
         }
       }
+      
+      if (count($ham_list) > 0)      { confirm_ham($euid, $ham_list );   }
+      if (count($spam_list) > 0)    { confirm_spam($euid, $spam_list);   }
+      if (count($delete_list) > 0 ) { delete_mail_reference($euid, $delete_list); }
 
       update_mail_stats($euid, "suspected_ham");
       if ($confirmed > 0) {

maia_db.php

@@ -1676 +1676 @@
 
 
     /*
-     * delete_mail(): Deletes a single mail item and all references
-     *                to it.
+     * delete_mail(): Deletes mail items and all references
+     *                to them.
      */
-    function delete_mail($mail_id)
+    function delete_mail($mail_ids)
     {
         global $dbh;
 
         // Delete any references to recipients
-        $delete = "DELETE FROM maia_mail_recipients WHERE mail_id = ?";
-        $dbh->query($delete, array($mail_id));
+        $delete = "DELETE FROM maia_mail_recipients WHERE mail_id IN (?" . str_repeat(',?', count($mail_ids) - 1) . ")";
+        $dbh->query($delete, $mail_ids);
 
         // Delete any references to SpamAssassin rules
-        $delete = "DELETE FROM maia_sa_rules_triggered WHERE mail_id = ?";
-        $dbh->query($delete, array($mail_id));
+        $delete = "DELETE FROM maia_sa_rules_triggered WHERE mail_id IN (?" . str_repeat(',?', count($mail_ids) - 1) . ")";
+        $dbh->query($delete, $mail_ids);
 
         // Delete any references to viruses
-        $delete = "DELETE FROM maia_viruses_detected WHERE mail_id = ?";
-        $dbh->query($delete, array($mail_id));
+        $delete = "DELETE FROM maia_viruses_detected WHERE mail_id IN (?" . str_repeat(',?', count($mail_ids) - 1) . ")";
+        $dbh->query($delete, $mail_ids);
 
         // Delete any references to banned file attachments
-        $delete = "DELETE FROM maia_banned_attachments_found WHERE mail_id = ?";
-        $dbh->query($delete, array($mail_id));
+        $delete = "DELETE FROM maia_banned_attachments_found WHERE mail_id IN (?" . str_repeat(',?', count($mail_ids) - 1) . ")";
+        $dbh->query($delete, $mail_ids);
 
         // Delete the mail item itself
-        $delete = "DELETE FROM maia_mail WHERE id = ?";
-        $dbh->query($delete, array($mail_id));
+        $delete = "DELETE FROM maia_mail WHERE id IN (?" . str_repeat(',?', count($mail_ids) - 1) . ")";
+        $dbh->query($delete, $mail_ids);
     }
 
 
     /*
-     * delete_mail_references(): Deletes a single mail item's recipient
+     * delete_mail_references(): Deletes mail items' recipient
      *                           references.
      */
-    function delete_mail_reference($user_id, $mail_id)
+    function delete_mail_reference($user_id, $mail_ids)
     {
         global $dbh;
+        global $logger;
 
-        // Delete a specific user's recipient reference to this mail.
-        $delete = "DELETE FROM maia_mail_recipients WHERE recipient_id = ? AND mail_id = ?";
-        $dbh->query($delete, array($user_id, $mail_id));
+        // Delete a specific users' recipient reference to these mail messages.
+        $delete = "DELETE FROM maia_mail_recipients WHERE recipient_id = ? AND mail_id IN (";
+        $delete .= '?' . str_repeat(',?', count($mail_ids) - 1);        
+        $delete .= ")";
 
-        // If there are no other recipients referenced by this mail item,
+        $dbh->query($delete, array_merge($user_id, $mail_ids));
+
+        // If there are no other recipients referenced by each mail item,
         // delete it.
-        $select = "SELECT recipient_id FROM maia_mail_recipients WHERE mail_id = ?";
-        $sth = $dbh->query($select, array($mail_id));
-        if (!$sth->fetchRow()) {
-            delete_mail($mail_id);
+
+        $select = "SELECT recipient_id, mail_id, maia_mail.id ".
+        "FROM      maia_mail " .
+        "LEFT JOIN maia_mail_recipients " . 
+               "ON maia_mail.id = maia_mail_recipients.mail_id " .
+        "WHERE maia_mail.id IN (?" . str_repeat(',?', count($mail_ids) - 1) .") " .
+          "AND mail_id IS NULL";
+        $sth = $dbh->query($select, $mail_ids);
+        if (DB::isError($sth)) {
+
+            $logger->err('Standard Message: ' . $sth->getMessage() . $select);
+            exit;
         }
-        $sth->free();
+        $deletions = array();
+        foreach ($mail_ids as $mail_id) {
+            while ($row = $sth->fetchrow() ) {
+                array_push($deletions, $row['id']);
+            }
+            $sth->free();
+        }
+        delete_mail($deletions);
+
     }
 
 
@@ -1805 +1825 @@
         }
         $sth->free();
     }
+    
+    function get_database_type($dbh)
+    {
+        return $dbh->phptype;
+    }
 
 
+    /* update the confirmation settings on one or multiple items.   */
+    function set_item_confirmations($message_type, $user_id, $mail_id) {
+        global $dbh;
+        if (get_database_type($dbh) == "mysql") {
+            $token_code = "CONCAT('expired', recipient_id, mail_id)";
+        } else {
+            $token_code = '"expired" || recipient_id || mail_id';
+        }
+        $update = "UPDATE maia_mail_recipients SET type = ?, token=" . $token_code  .
+                " WHERE recipient_id = ? AND mail_id IN (";
+                
+        $update .= '?' . str_repeat(',?', count($mail_id) - 1);
+        
+        $update .= ")";
+        $dbh->query($update, array_merge($message_type, $user_id, $mail_id));       
+    }
+
      /*
-     * report_spam(): Confirm a mail item as false negative spam for one recipient.
-     */
+      * report_spam(): Confirm mail item(s) as false negative spam.   
+             mail_id can be a scalar or an array
+      */
     function report_spam($user_id, $mail_id)
     {
         global $dbh;
 
-        $expired_token = 'expired' . $user_id . $mail_id;
-
-        // Mark the item as Confirmed Spam
-        $update = "UPDATE maia_mail_recipients SET type = 'C', token=? " .
-                  "WHERE recipient_id = ? AND mail_id = ?";
-        $dbh->query($update, array($expired_token, $user_id, $mail_id));
-
-        // Add the item to the Spam stats columns
+        // Mark the items as Confirmed Spam
+        confirm_spam($user_id, $mail_id);
+            
+        // Also add the items to the Spam stats columns
         record_mail_stats($user_id, $mail_id, "fn");
 
     }
 
     /*
-     * confirm_spam(): Confirm a mail item as spam for one recipient.
+     * confirm_spam(): Confirm mail item(s) as spam.
+                      mail_id can be a scalar or an array
      */
     function confirm_spam($user_id, $mail_id)
     {
         global $dbh;
 
-        $expired_token = 'expired' . $user_id . $mail_id;
+        // Mark the items as Confirmed Spam
+        set_item_confirmations('C', $user_id, $mail_id);
 
-        // Mark the item as Confirmed Spam
-        $update = "UPDATE maia_mail_recipients SET type = 'C', token=? " .
-                  "WHERE recipient_id = ? AND mail_id = ?";
-        $dbh->query($update, array($expired_token, $user_id, $mail_id));
-
-        // Add the item to the Spam stats columns
+        // Add the items to the Spam stats columns
         record_mail_stats($user_id, $mail_id, "spam");
     }
 
 
     /*
-     * confirm_ham(): Confirm a mail item as ham for one recipient.
+     * confirm_ham(): Confirm mail item(s) as ham.
+                      mail_id can be a scalar or an array
      */
-    function confirm_ham($user_id, $mail_id)
+    function confirm_ham($user_id, $mail_ids)
     {
         global $dbh;
 
-        $expired_token = 'expired' . $user_id . $mail_id;
+        // Mark the items as Confirmed Ham
+        set_item_confirmations('G', $user_id, $mail_ids);
 
-        // Mark the item as Confirmed Ham
-        $update = "UPDATE maia_mail_recipients SET type = 'G', token=? " .
-                  "WHERE recipient_id = ? AND mail_id = ?";
-        $dbh->query($update, array($expired_token, $user_id, $mail_id));
-
-        // Add the item to the Ham stats columns
-        record_mail_stats($user_id, $mail_id, "ham");
+        // Add the items to the Ham stats columns
+        record_mail_stats($user_id, $mail_ids, "ham");
     }
 
 
@@ -1872 +1905 @@
     {
         global $dbh;
 
-        $expired_token = 'expired' . $user_id . $mail_id;
-
         $select = "SELECT sender_email, contents, " .
                          "envelope_to, maia_mail_recipients.type " .
                   "FROM maia_mail, maia_mail_recipients " .
@@ -1922 +1953 @@
                 if ($succeeded = (strncmp($smtp_result, "2", 1) == 0)) {
                     if ($type == "S") {
                         record_mail_stats($user_id, $mail_id, "fp");
-                        $update = "UPDATE maia_mail_recipients SET type = 'G', token=? " .
-                                  "WHERE recipient_id = ? AND mail_id = ?";
-                        $dbh->query($update, array($expired_token, $user_id, $mail_id));
+                        set_item_confirmations('G', $user_id, $mail_id);
                         if (get_user_value($user_id, "auto_whitelist") == "Y") {
                             add_address_to_wb_list($user_id, $sender_email, "W");
                         }
@@ -2036 +2065 @@
 
 
     /*
-     * record_mail_stats(): Recalculate the specified user's stats record
+     * record_mail_stats(): Recalculate the specified users' stats records
      *                      for items of the specified (static) type, after
      *                      suspected [spam|ham] is confirmed.
      */
-    function record_mail_stats($euid, $mail_id, $type)
+    function record_mail_stats($euid, $mail_ids, $type)
     {
-        global $dbh;
-
+      global $dbh;
+      foreach ($mail_ids as $mail_id) {  
         $select = "SELECT received_date, size, score " .
                   "FROM maia_mail WHERE id = ?";
         $sth = $dbh->query($select, array($mail_id));
@@ -2161 +2190 @@
             $sth2->free();
         }
         $sth->free();
+      }
     }
     
     /*