X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Ftree.php;h=5d9657943c8db0cc2e1955194da26d71f56ae00c;hb=d61a01d48fa9d58a7fdd5a99e7943b7dcaa94178;hp=99a7198b041d19eb73eca94cf591006d39f7027b;hpb=a2790a617beaef97a2d87e5bebc0e37a12c8c2ea;p=squirrelmail.git
diff --git a/functions/tree.php b/functions/tree.php
index 99a7198b..5d965794 100644
--- a/functions/tree.php
+++ b/functions/tree.php
@@ -1,20 +1,49 @@
-1)
return $result;
}
@@ -33,99 +62,95 @@
// create a new subNode
$newNodeIndex = count($tree);
- $tree[$newNodeIndex]["value"] = $value;
- $tree[$newNodeIndex]["doIHaveChildren"] = false;
+ $tree[$newNodeIndex]['value'] = $value;
+ $tree[$newNodeIndex]['doIHaveChildren'] = false;
- if ($tree[$parentNode]["doIHaveChildren"] == false) {
+ if ($tree[$parentNode]['doIHaveChildren'] == false) {
// make sure the parent knows it has children
- $tree[$parentNode]["subNodes"][0] = $newNodeIndex;
- $tree[$parentNode]["doIHaveChildren"] = true;
+ $tree[$parentNode]['subNodes'][0] = $newNodeIndex;
+ $tree[$parentNode]['doIHaveChildren'] = true;
} else {
- $nextSubNode = count($tree[$parentNode]["subNodes"]);
+ $nextSubNode = count($tree[$parentNode]['subNodes']);
// make sure the parent knows it has children
- $tree[$parentNode]["subNodes"][$nextSubNode] = $newNodeIndex;
+ $tree[$parentNode]['subNodes'][$nextSubNode] = $newNodeIndex;
}
}
function walkTreeInPreOrderEmptyTrash($index, $imap_stream, $tree) {
global $trash_folder;
- if ($tree[$index]["doIHaveChildren"]) {
- for ($j = 0; $j < count($tree[$index]["subNodes"]); $j++) {
- walkTreeInPreOrderEmptyTrash($tree[$index]["subNodes"][$j], $imap_stream, $tree);
+ 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) {
- sqimap_mailbox_delete($imap_stream, $tree[$index]["value"]);
+ 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");
- sqimap_mailbox_expunge($imap_stream, $trash_folder);
- sqimap_mailbox_close($imap_stream);
+ sqimap_messages_flag ($imap_stream, 1, $numMessages, 'Deleted');
+ sqimap_mailbox_expunge($imap_stream, $trash_folder, true);
}
}
} else {
- if ($tree[$index]["value"] != $trash_folder) {
- sqimap_mailbox_delete($imap_stream, $tree[$index]["value"]);
+ 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");
- sqimap_mailbox_expunge($imap_stream, $trash_folder);
- sqimap_mailbox_close($imap_stream);
+ sqimap_messages_flag ($imap_stream, 1, $numMessages, 'Deleted');
+ sqimap_mailbox_expunge($imap_stream, $trash_folder, true);
}
}
}
}
function walkTreeInPreOrderDeleteFolders($index, $imap_stream, $tree) {
- if ($tree[$index]["doIHaveChildren"]) {
- for ($j = 0; $j < count($tree[$index]["subNodes"]); $j++) {
- walkTreeInPreOrderDeleteFolders($tree[$index]["subNodes"][$j], $imap_stream, $tree);
+ if ($tree[$index]['doIHaveChildren']) {
+ for ($j = 0; $j < count($tree[$index]['subNodes']); $j++) {
+ walkTreeInPreOrderDeleteFolders($tree[$index]['subNodes'][$j], $imap_stream, $tree);
}
- sqimap_mailbox_delete($imap_stream, $tree[$index]["value"]);
+ sqimap_mailbox_delete($imap_stream, $tree[$index]['value']);
} else {
- sqimap_mailbox_delete($imap_stream, $tree[$index]["value"]);
+ sqimap_mailbox_delete($imap_stream, $tree[$index]['value']);
}
}
- function walkTreeInPostOrderCreatingFoldersUnderTrash($index, $imap_stream, $tree, $dm, $topFolderName) {
- global $trash_folder;
+ function walkTreeInPostOrderCreatingFoldersUnderTrash($index, $imap_stream, $tree, $topFolderName) {
+ global $trash_folder, $delimiter;
- $position = strrpos($topFolderName, $dm) + 1;
- $subFolderName = substr($tree[$index]["value"], $position);
+ $position = strrpos($topFolderName, $delimiter) + 1;
+ $subFolderName = substr($tree[$index]['value'], $position);
- if ($tree[$index]["doIHaveChildren"]) {
- sqimap_mailbox_create($imap_stream, $trash_folder . $dm . $subFolderName, "");
- sqimap_mailbox_select($imap_stream, $tree[$index]["value"]);
+ 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"]);
+ $messageCount = sqimap_get_num_messages($imap_stream, $tree[$index]['value']);
if ($messageCount > 0)
- sqimap_messages_copy($imap_stream, 1, $messageCount, $trash_folder . $dm . $subFolderName);
+ sqimap_messages_copy($imap_stream, 1, $messageCount, $trash_folder . $delimiter . $subFolderName);
- for ($j = 0;$j < count($tree[$index]["subNodes"]); $j++)
- walkTreeInPostOrderCreatingFoldersUnderTrash($tree[$index]["subNodes"][$j], $imap_stream, $tree, $dm, $topFolderName);
- sqimap_mailbox_close($imap_stream);
+ 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 . $dm . $subFolderName, "");
- sqimap_mailbox_select($imap_stream, $tree[$index]["value"]);
+ 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"]);
+ $messageCount = sqimap_get_num_messages($imap_stream, $tree[$index]['value']);
if ($messageCount > 0)
- sqimap_messages_copy($imap_stream, 1, $messageCount, $trash_folder . $dm . $subFolderName);
- sqimap_mailbox_close($imap_stream);
+ sqimap_messages_copy($imap_stream, 1, $messageCount, $trash_folder . $delimiter . $subFolderName);
}
}
function simpleWalkTreePre($index, $tree) {
- if ($tree[$index]["doIHaveChildren"]) {
- for ($j = 0; $j < count($tree[$index]["subNodes"]); $j++) {
- simpleWalkTreePre($tree[$index]["subNodes"][$j], $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'] . '
';
}
}
?>