CLOSE the selected mailbox (unselect) before we delete it.

Thnx Julia Goolia for spotting this.

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

diff --git a/functions/tree.php b/functions/tree.php
index 322d3a2a82c9ff458dde71f50f2d5032b2766336..8639292220e17d846c477fdc8518b20c6136ed24 100644 (file)
--- a/functions/tree.php
+++ b/functions/tree.php
@@ -70,19 +70,21 @@ function walkTreeInPreOrderEmptyTrash($index, $imap_stream, $tree) {
             sqimap_mailbox_delete($imap_stream, $tree[$index]['value']);
         } else {
             $mbx_response = sqimap_mailbox_select($imap_stream, $trash_folder);
             sqimap_mailbox_delete($imap_stream, $tree[$index]['value']);
         } else {
             $mbx_response = sqimap_mailbox_select($imap_stream, $trash_folder);

-           if ($mbx_response['EXISTS'] > 0) {
+            if ($mbx_response['EXISTS'] > 0) {

                sqimap_messages_flag ($imap_stream, 1, '*', 'Deleted', true);
                sqimap_messages_flag ($imap_stream, 1, '*', 'Deleted', true);

-               sqimap_mailbox_expunge($imap_stream, $trash_folder, true);
+               // CLOSE === EXPUNGE and UNSELECT
+               sqimap_run_command($imap_stream,'CLOSE',false,$response,$message);

             }
         }
     } else {
         if ($tree[$index]['value'] != $trash_folder) {
             sqimap_mailbox_delete($imap_stream, $tree[$index]['value']);
         } else {
             }
         }
     } else {
         if ($tree[$index]['value'] != $trash_folder) {
             sqimap_mailbox_delete($imap_stream, $tree[$index]['value']);
         } else {

-           $mbx_response = sqimap_mailbox_select($imap_stream, $trash_folder);     
-           if ($mbx_response['EXISTS'] > 0) {
-               sqimap_messages_flag ($imap_stream, 1, '*', 'Deleted', true);
-               sqimap_mailbox_expunge($imap_stream, $trash_folder, true);
+            $mbx_response = sqimap_mailbox_select($imap_stream, $trash_folder);
+            if ($mbx_response['EXISTS'] > 0) {
+                sqimap_messages_flag ($imap_stream, 1, '*', 'Deleted', true);
+                // CLOSE === EXPUNGE and UNSELECT
+                sqimap_run_command($imap_stream,'CLOSE',false,$response,$message);

             }
         }
     }
             }
         }
     }


@@ -109,17 +111,23 @@ function walkTreeInPostOrderCreatingFoldersUnderTrash($index, $imap_stream, $tre
     if ($tree[$index]['doIHaveChildren']) {
         sqimap_mailbox_create($imap_stream, $trash_folder . $delimiter . $subFolderName, "");
         $mbx_response = sqimap_mailbox_select($imap_stream, $tree[$index]['value']);       
     if ($tree[$index]['doIHaveChildren']) {
         sqimap_mailbox_create($imap_stream, $trash_folder . $delimiter . $subFolderName, "");
         $mbx_response = sqimap_mailbox_select($imap_stream, $tree[$index]['value']);       

-       $messageCount = $mbx_response['EXISTS'];
-        if ($messageCount > 0)
+        $messageCount = $mbx_response['EXISTS'];
+        if ($messageCount > 0) {

             sqimap_messages_copy($imap_stream, 1, '*', $trash_folder . $delimiter . $subFolderName);
             sqimap_messages_copy($imap_stream, 1, '*', $trash_folder . $delimiter . $subFolderName);

+        }
+        // after copy close the mailbox to get in unselected state
+        sqimap_run_command($imap_stream,'CLOSE',false,$response,$message);

         for ($j = 0;$j < count($tree[$index]['subNodes']); $j++)
             walkTreeInPostOrderCreatingFoldersUnderTrash($tree[$index]['subNodes'][$j], $imap_stream, $tree, $topFolderName);
     } else {
         sqimap_mailbox_create($imap_stream, $trash_folder . $delimiter . $subFolderName, '');
         $mbx_response = sqimap_mailbox_select($imap_stream, $tree[$index]['value']);
         $messageCount = $mbx_response['EXISTS'];
         for ($j = 0;$j < count($tree[$index]['subNodes']); $j++)
             walkTreeInPostOrderCreatingFoldersUnderTrash($tree[$index]['subNodes'][$j], $imap_stream, $tree, $topFolderName);
     } else {
         sqimap_mailbox_create($imap_stream, $trash_folder . $delimiter . $subFolderName, '');
         $mbx_response = sqimap_mailbox_select($imap_stream, $tree[$index]['value']);
         $messageCount = $mbx_response['EXISTS'];

-        if ($messageCount > 0)
+        if ($messageCount > 0) {

             sqimap_messages_copy($imap_stream, 1, '*', $trash_folder . $delimiter . $subFolderName);
             sqimap_messages_copy($imap_stream, 1, '*', $trash_folder . $delimiter . $subFolderName);

+        }
+        // after copy close the mailbox to get in unselected state
+        sqimap_run_command($imap_stream,'CLOSE',false,$response,$message);

     }
 }
 
     }
 }