added auto expunge

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@137 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/config/config.php b/config/config.php
index a18227d9911e8d0eb8bb8bd00b6be068fbc2c1ad..58b3ebadf7cf7c2ecfa92e6ad14b88a6abe057e0 100644 (file)
--- a/config/config.php
+++ b/config/config.php
@@ -81,7 +81,7 @@
 
     $default_move_to_trash = true;
     $trash_folder = "INBOX.Trash";
-    $default_auto_expunge = true;
+    $auto_expunge = true;
 
 //  Special Folders are folders that can't be manipulated like normal user created
 //  folders can.  A couple of examples would be "INBOX.Trash", "INBOX.Drafts".  We have

diff --git a/functions/imap.php b/functions/imap.php
index d700c84eaccd3d3876ac2129a9d6510f25452a80..a1876c77c8cbf4557009f8e96f10b65016a9215e 100644 (file)
--- a/functions/imap.php
+++ b/functions/imap.php
@@ -292,7 +292,10 @@
       } else {
          setMessageFlag($imapConnection, $a, $b, "Deleted");
       }
+      if ($auto_expunge == true)
+         expungeBox($imapConnection, $mailbox);
    }
+
    function stripComments($line) {
       if (strpos($line, ";")) {
          $line = substr($line, 0, strpos($line, ";"));

diff --git a/functions/mailbox.php b/functions/mailbox.php
index 1f9a5024dfcc3eb58a0fae92ed8694f404b103ac..9a49839898294373a0c49da092e02b9dd4b664ed 100644 (file)
--- a/functions/mailbox.php
+++ b/functions/mailbox.php
@@ -227,6 +227,7 @@
    function expungeBox($imapConnection, $mailbox) {
       selectMailbox($imapConnection, $mailbox, $num);
       fputs($imapConnection, "1 EXPUNGE\n");
+      imapReadData($imapConnection, "1", true, $response, $message);
    }
 
    function getFolderNameMinusINBOX($mailbox, $del) {