update

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

diff --git a/config/config.php b/config/config.php
index 1761bcd36e9d4cb6a07cdc52022852967526d3ac..9048b0aa18533265384c31d2a8a9d3ccc2a99cf3 100644 (file)
--- a/config/config.php
+++ b/config/config.php
@@ -29,7 +29,7 @@ $version = "0.0.1";
  *           will get expunged, removing all messages marked "Deleted".
  */
 
  *           will get expunged, removing all messages marked "Deleted".
  */
 

-$move_to_trash = false;
+$move_to_trash = true;

 $trash_folder = "INBOX.Trash";
 $auto_expunge = true;
 
 $trash_folder = "INBOX.Trash";
 $auto_expunge = true;
 

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 06df3ad132fa8abfba73e63a61d4ebfff9c677e2..d6c9a6db78d91abebe89c6063b91f0094c8c95ff 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -1,4 +1,5 @@
 <?
 <?

+

    /**
     **  mailbox_display.php
     **
    /**
     **  mailbox_display.php
     **

diff --git a/src/folders.php b/src/folders.php
index b63509540e607b615110726d8375fa9d3c5f2996..7b7ec043a66d59175e1a7d9f9e476b01b75ac8bd 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -35,13 +35,12 @@
    }
 
    /** DELETING FOLDERS **/
    }
 
    /** DELETING FOLDERS **/

+

    echo "<FORM ACTION=folders_delete.php METHOD=POST>\n";
    echo "<SELECT NAME=mailbox><FONT FACE=\"Arial,Helvetica\">\n";
    for ($i = 0; $i < count($str); $i++) {
       $thisbox = Chop($str[$i]);
       $thisbox = findMailboxName($thisbox);
    echo "<FORM ACTION=folders_delete.php METHOD=POST>\n";
    echo "<SELECT NAME=mailbox><FONT FACE=\"Arial,Helvetica\">\n";
    for ($i = 0; $i < count($str); $i++) {
       $thisbox = Chop($str[$i]);
       $thisbox = findMailboxName($thisbox);

-      $thisbox = getFolderNameMinuxINBOX($thisbox);
-

       $use_folder = true;
       for ($p = 0; $p < count($special_folders); $p++) {
          if ($special_folders[$p] == $long_name_boxes[$i])
       $use_folder = true;
       for ($p = 0; $p < count($special_folders); $p++) {
          if ($special_folders[$p] == $long_name_boxes[$i])

diff --git a/src/folders_delete.php b/src/folders_delete.php
index 4c318a4098c52edabb64227c7443953aabf3ac03..8bc2ff5aa91340893f7ac99460a3d6971de108e0 100644 (file)
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -8,8 +8,6 @@
    $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
 
    // switch to the mailbox, and get the number of messages in it.
    $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
 
    // switch to the mailbox, and get the number of messages in it.

-   echo "$mailbox<BR>";
-   exit;

    selectMailbox($imapConnection, $mailbox, $numMessages);
 
    $folder = getFolderNameMinusINBOX($mailbox);
    selectMailbox($imapConnection, $mailbox, $numMessages);
 
    $folder = getFolderNameMinusINBOX($mailbox);


@@ -29,7 +27,6 @@
    } else {
       removeFolder($imapConnection, "user.$username.$folder");
    }
    } else {
       removeFolder($imapConnection, "user.$username.$folder");
    }

-   echo "success";

 
    // Log out this session
    fputs($imapConnection, "1 logout");
 
    // Log out this session
    fputs($imapConnection, "1 logout");