/**
* tree.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This code provides various string manipulation functions that are
* used by the rest of the Squirrelmail code.
*
* $Id$
+ * @package squirrelmail
*/
-require_once('../functions/imap.php');
+/** Clearly, this needs the IMAP functions.. */
+require_once(SM_PATH . 'functions/imap.php');
/**
- * findParentForChild
- *
* Recursive function to find the correct parent for a new node
*/
if ($tree[$index]['value'] != $trash_folder) {
sqimap_mailbox_delete($imap_stream, $tree[$index]['value']);
} else {
- $numMessages = sqimap_get_num_messages($imap_stream, $trash_folder);
- if ($numMessages > 0) {
- sqimap_mailbox_select($imap_stream, $trash_folder);
- sqimap_messages_flag ($imap_stream, 1, $numMessages, '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);
}
}
} else {
if ($tree[$index]['value'] != $trash_folder) {
sqimap_mailbox_delete($imap_stream, $tree[$index]['value']);
} else {
- $numMessages = sqimap_get_num_messages($imap_stream, $trash_folder);
- if ($numMessages > 0) {
- sqimap_mailbox_select($imap_stream, $trash_folder);
- sqimap_messages_flag ($imap_stream, 1, $numMessages, '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);
}
}
}
}
+
function walkTreeInPreOrderDeleteFolders($index, $imap_stream, $tree) {
if ($tree[$index]['doIHaveChildren']) {
for ($j = 0; $j < count($tree[$index]['subNodes']); $j++) {
if ($tree[$index]['doIHaveChildren']) {
sqimap_mailbox_create($imap_stream, $trash_folder . $delimiter . $subFolderName, "");
- sqimap_mailbox_select($imap_stream, $tree[$index]['value']);
-
- $messageCount = sqimap_get_num_messages($imap_stream, $tree[$index]['value']);
- if ($messageCount > 0)
- sqimap_messages_copy($imap_stream, 1, $messageCount, $trash_folder . $delimiter . $subFolderName);
-
+ $mbx_response = sqimap_mailbox_select($imap_stream, $tree[$index]['value']);
+ $messageCount = $mbx_response['EXISTS'];
+ if ($messageCount > 0) {
+ 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, '');
- sqimap_mailbox_select($imap_stream, $tree[$index]['value']);
-
- $messageCount = sqimap_get_num_messages($imap_stream, $tree[$index]['value']);
- if ($messageCount > 0)
- sqimap_messages_copy($imap_stream, 1, $messageCount, $trash_folder . $delimiter . $subFolderName);
+ $mbx_response = sqimap_mailbox_select($imap_stream, $tree[$index]['value']);
+ $messageCount = $mbx_response['EXISTS'];
+ if ($messageCount > 0) {
+ 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);
}
}