X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Ftree.php;h=f37c8422a7ee06dd3472177d9cf0b1b0bc9136f9;hb=6e189ce2d5f55a924286a193bdaa1978d82d5ea3;hp=99a7198b041d19eb73eca94cf591006d39f7027b;hpb=a2790a617beaef97a2d87e5bebc0e37a12c8c2ea;p=squirrelmail.git

diff --git a/functions/tree.php b/functions/tree.php
index 99a7198b..f37c8422 100644
--- a/functions/tree.php
+++ b/functions/tree.php
@@ -1,20 +1,22 @@
 <?php
-   $tree_php = true;
 
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($config_php))
-      include("../config/config.php");
+   /* $Id$ */
+
+   if (defined('tree_php'))
+       return;
+   define('tree_php', true);
+
+   require_once('../functions/imap.php');
 
    // Recursive function to find the correct parent for a new node
    function findParentForChild($value, $treeIndexToStart, $tree) {
-      // is $value in $tree[$treeIndexToStart]["value"]
-      if ((isset($tree[$treeIndexToStart])) && (strstr($value, $tree[$treeIndexToStart]["value"]))) {
+      // is $value in $tree[$treeIndexToStart]['value']
+      if ((isset($tree[$treeIndexToStart])) && (strstr($value, $tree[$treeIndexToStart]['value']))) {
          // do I have children, if not then must be a childnode of the current node
-         if ($tree[$treeIndexToStart]["doIHaveChildren"]) {
+         if ($tree[$treeIndexToStart]['doIHaveChildren']) {
             // loop through each subNode checking to see if we are a subNode of one of them
-            for ($i=0;$i< count($tree[$treeIndexToStart]["subNodes"]);$i++) {
-               $result = findParentForChild($value, $tree[$treeIndexToStart]["subNodes"][$i], $tree);
+            for ($i=0;$i< count($tree[$treeIndexToStart]['subNodes']);$i++) {
+               $result = findParentForChild($value, $tree[$treeIndexToStart]['subNodes'][$i], $tree);
                if ($result > -1)
                   return $result;
             }
@@ -33,60 +35,58 @@
 
       // 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']);
       }
    }
 
@@ -94,38 +94,36 @@
       global $trash_folder;
 
       $position = strrpos($topFolderName, $dm) + 1;
-      $subFolderName = substr($tree[$index]["value"], $position);
+      $subFolderName = substr($tree[$index]['value'], $position);
 
-      if ($tree[$index]["doIHaveChildren"]) {
+      if ($tree[$index]['doIHaveChildren']) {
          sqimap_mailbox_create($imap_stream, $trash_folder . $dm . $subFolderName, "");
-         sqimap_mailbox_select($imap_stream, $tree[$index]["value"]);
+         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);
          
-         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, $dm, $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 . $dm . $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);
       }
    }
 
    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"] . "<br>";
+         echo $tree[$index]['value'] . '<br>';
       } else {
-         echo $tree[$index]["value"] . "<br>";
+         echo $tree[$index]['value'] . '<br>';
       }
    }
-?>
+?>
\ No newline at end of file