X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Ftree.php;h=44a99e848329b3ad073f30c2ec2cc6fa136d804f;hb=a9a7cda1e186f13501bd2d59a28c0763f16f2f96;hp=c35bc0e2eaa5da0fc46ea5b28a9ad30e32c01033;hpb=d6c32258c05219670ab3b4ae2d460d844ea9a247;p=squirrelmail.git
diff --git a/functions/tree.php b/functions/tree.php
index c35bc0e2..44a99e84 100644
--- a/functions/tree.php
+++ b/functions/tree.php
@@ -3,13 +3,12 @@
/**
* tree.php
*
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * This file provides functions to walk trees of folders, for
+ * instance to delete a whole tree.
*
- * This code provides various string manipulation functions that are
- * used by the rest of the Squirrelmail code.
- *
- * $Id$
+ * @copyright © 1999-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
* @package squirrelmail
*/
@@ -17,9 +16,13 @@
require_once(SM_PATH . 'functions/imap.php');
/**
- * Recursive function to find the correct parent for a new node
+ * Recursive function to find the correct parent for a new node.
+ *
+ * @param mixed value the value to find a parent for
+ * @param int treeIndexToStart where to start the search, usually the root node (0)
+ * @param array tree the tree to search
+ * @return int the index of the parent
*/
-
function findParentForChild($value, $treeIndexToStart, $tree) {
// is $value in $tree[$treeIndexToStart]['value']
if ((isset($tree[$treeIndexToStart])) && (strstr($value, $tree[$treeIndexToStart]['value']))) {
@@ -41,6 +44,13 @@ function findParentForChild($value, $treeIndexToStart, $tree) {
}
}
+/**
+ * Will insert a new value into the tree, based on a given comparison value.
+ *
+ * @param mixed comparisonValue the value to determine where the new element should be placed.
+ * @param mixed value the new node to insert
+ * @param array tree the tree to insert the node in, by ref
+ */
function addChildNodeToTree($comparisonValue, $value, &$tree) {
$parentNode = findParentForChild($comparisonValue, 0, $tree);
@@ -60,29 +70,50 @@ function addChildNodeToTree($comparisonValue, $value, &$tree) {
}
}
+/**
+ * Recursively walk the tree of trash mailboxes and delete all folders and messages
+ *
+ * @param int index the place in the tree to start, usually 0
+ * @param stream imap_stream the IMAP connection to send commands to
+ * @param array tree the tree to walk
+ * @return void
+ */
function walkTreeInPreOrderEmptyTrash($index, $imap_stream, $tree) {
global $trash_folder;
+ walkTreeInPreOrderEmptyFolder($index, $imap_stream, $tree, $trash_folder);
+}
+
+/**
+ * Recursively walk the tree of mailboxes in the given folder and delete all folders and messages
+ *
+ * @param int index the place in the tree to start, usually 0
+ * @param stream imap_stream the IMAP connection to send commands to
+ * @param array tree the tree to walk
+ * @param mailbox the name of the root folder to empty
+ * @return void
+ */
+function walkTreeInPreOrderEmptyFolder($index, $imap_stream, $tree, $mailbox) {
if ($tree[$index]['doIHaveChildren']) {
for ($j = 0; $j < count($tree[$index]['subNodes']); $j++) {
walkTreeInPreOrderEmptyTrash($tree[$index]['subNodes'][$j], $imap_stream, $tree);
}
- if ($tree[$index]['value'] != $trash_folder) {
+ if ($tree[$index]['value'] != $mailbox) {
sqimap_mailbox_delete($imap_stream, $tree[$index]['value']);
} else {
- $mbx_response = sqimap_mailbox_select($imap_stream, $trash_folder);
+ $mbx_response = sqimap_mailbox_select($imap_stream, $mailbox);
if ($mbx_response['EXISTS'] > 0) {
- sqimap_messages_flag ($imap_stream, 1, '*', 'Deleted', true);
+ sqimap_toggle_flag($imap_stream, '1:*', '\\Deleted', true, true);
// CLOSE === EXPUNGE and UNSELECT
sqimap_run_command($imap_stream,'CLOSE',false,$response,$message);
}
}
} else {
- if ($tree[$index]['value'] != $trash_folder) {
+ if ($tree[$index]['value'] != $mailbox) {
sqimap_mailbox_delete($imap_stream, $tree[$index]['value']);
} else {
- $mbx_response = sqimap_mailbox_select($imap_stream, $trash_folder);
+ $mbx_response = sqimap_mailbox_select($imap_stream, $mailbox);
if ($mbx_response['EXISTS'] > 0) {
- sqimap_messages_flag ($imap_stream, 1, '*', 'Deleted', true);
+ sqimap_toggle_flag($imap_stream, '1:*', '\\Deleted', true, true);
// CLOSE === EXPUNGE and UNSELECT
sqimap_run_command($imap_stream,'CLOSE',false,$response,$message);
}
@@ -91,6 +122,14 @@ function walkTreeInPreOrderEmptyTrash($index, $imap_stream, $tree) {
}
+/**
+ * Recursively delete a tree of mail folders.
+ *
+ * @param int index the place in the tree to start, usually 0
+ * @param stream imap_stream the IMAP connection to send commands to
+ * @param array tree the tree to walk
+ * @return void
+ */
function walkTreeInPreOrderDeleteFolders($index, $imap_stream, $tree) {
if ($tree[$index]['doIHaveChildren']) {
for ($j = 0; $j < count($tree[$index]['subNodes']); $j++) {
@@ -102,17 +141,24 @@ function walkTreeInPreOrderDeleteFolders($index, $imap_stream, $tree) {
}
}
+/**
+ * Recursively walk a tree of folders to create them under the trash folder.
+ */
function walkTreeInPostOrderCreatingFoldersUnderTrash($index, $imap_stream, $tree, $topFolderName) {
global $trash_folder, $delimiter;
- $position = strrpos($topFolderName, $delimiter) + 1;
+ $position = strrpos($topFolderName, $delimiter);
+ if ($position !== FALSE) {
+ $position++;
+ }
$subFolderName = substr($tree[$index]['value'], $position);
if ($tree[$index]['doIHaveChildren']) {
sqimap_mailbox_create($imap_stream, $trash_folder . $delimiter . $subFolderName, "");
- $mbx_response = sqimap_mailbox_select($imap_stream, $tree[$index]['value']);
+ $mbx_response = sqimap_mailbox_select($imap_stream, $tree[$index]['value']);
$messageCount = $mbx_response['EXISTS'];
if ($messageCount > 0) {
+ // FIXME: broken call
sqimap_messages_copy($imap_stream, 1, '*', $trash_folder . $delimiter . $subFolderName);
}
// after copy close the mailbox to get in unselected state
@@ -124,6 +170,7 @@ function walkTreeInPostOrderCreatingFoldersUnderTrash($index, $imap_stream, $tre
$mbx_response = sqimap_mailbox_select($imap_stream, $tree[$index]['value']);
$messageCount = $mbx_response['EXISTS'];
if ($messageCount > 0) {
+ // FIXME: broken call
sqimap_messages_copy($imap_stream, 1, '*', $trash_folder . $delimiter . $subFolderName);
}
// after copy close the mailbox to get in unselected state
@@ -131,14 +178,21 @@ function walkTreeInPostOrderCreatingFoldersUnderTrash($index, $imap_stream, $tre
}
}
+/**
+ * Recursive function that outputs a tree In-Pre-Order.
+ * @param int index the node to start (usually 0)
+ * @param array tree the tree to walk
+ * @return void
+ */
function simpleWalkTreePre($index, $tree) {
if ($tree[$index]['doIHaveChildren']) {
for ($j = 0; $j < count($tree[$index]['subNodes']); $j++) {
simpleWalkTreePre($tree[$index]['subNodes'][$j], $tree);
}
- echo $tree[$index]['value'] . '
';
+ echo $tree[$index]['value'] . '
';
} else {
- echo $tree[$index]['value'] . '
';
+ echo $tree[$index]['value'] . '
';
}
}
-?>
+
+?>
\ No newline at end of file