projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: e457e58)
A lot of code optimization with regard to deleting and creating folders.
authorlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Mon, 29 Nov 1999 19:32:39 +0000 (19:32 +0000)
committerlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Mon, 29 Nov 1999 19:32:39 +0000 (19:32 +0000)
Also, emptying trash refreshes the folder list.

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

config/config.php patch | blob | blame | history
functions/display_messages.php patch | blob | blame | history
src/empty_trash.php patch | blob | blame | history
src/folders.php patch | blob | blame | history
src/webmail.php patch | blob | blame | history

diff --git a/config/config.php b/config/config.php
index 4cbbb46bfa23b0ef851ea076783ab8430467fa0f..36bd5d8c2b5a6cb94b47bfcecbf0970419b4ad04 100644 (file)
--- a/config/config.php
+++ b/config/config.php
@@ -37,11 +37,10 @@ $auto_expunge = true;
    folders can.  A couple of examples would be "INBOX.Trash", "INBOX.Drafts".  We have
    them set to Netscape's default mailboxes, but this obviously can be changed.
    To add one, just add a new number to the array.
-
-   NOTE:   INBOX is handled separately.  Do not put it in this list
 */
-$special_folders[0] = $trash_folder;
-$special_folders[1] = "INBOX.Sent";
-$special_folders[2] = "INBOX.Drafts";
-$special_folders[3] = "INBOX.Templates";
+$special_folders[0] = "INBOX";
+$special_folders[1] = $trash_folder;
+$special_folders[2] = "INBOX.Sent";
+$special_folders[3] = "INBOX.Drafts";
+$special_folders[4] = "INBOX.Templates";
 ?>
diff --git a/functions/display_messages.php b/functions/display_messages.php
index 6fb180057abf1260a433ab1151463fe9867a3594..bebc98bf65769eedbb173b8cc82d37fcad2d580c 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -57,7 +57,7 @@
       echo "         <FONT FACE=\"Arial,Helvetica\"><B><CENTER>Messages Deleted</CENTER></B></FONT>";
       echo "   </TD></TR><TR><TD>";
       echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>The selected messages were deleted successfully.<BR>\n";
-      echo "              <A HREF=\"right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=\"right\">";
+      echo "              <A HREF=\"webmail.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
       echo "              Click here to return to $mailbox";
       echo "              </A>.";
       echo "      </FONT></CENTER>";
diff --git a/src/empty_trash.php b/src/empty_trash.php
index bc554d636e71037f6b36a475387775510aeb05dd..ea38697ef29e2de6bcfaa7a7acb3829eef94c51b 100644 (file)
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -45,11 +45,10 @@
          removeFolder($imapConnection, $thisfolder);
       }
    }
-   // Log out this session
-   fputs($imapConnection, "1 logout");
 
+   selectMailbox($imapConnection, $trash_folder, $numMessages);
    echo "<HTML><BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000EE\" VLINK=\"#0000EE\" ALINK=\"#0000EE\">";
    displayPageHeader($mailbox);
-
-   messages_deleted_message("INBOX", $sort, $startMessage);
+   messages_deleted_message($trash_folder, $sort, $startMessage);
+   fputs($imapConnection, "1 logout");
 ?>
diff --git a/src/folders.php b/src/folders.php
index d45363026a4c46d2327943b303041e552f1ac465..128399b2f08caca4fbc4383964c7491b0bf965b8 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -23,12 +23,10 @@
    for ($i = 0; $i < count($boxesUnformatted); $i++) {
       $use_folder = true;
       for ($p = 0; $p < count($special_folders); $p++) {
-         if (substr($boxesUnformatted[$i], 0, strlen($special_folders[$p])) == $special_folders[$p]) {
+         if ($boxesUnformatted[$i] == $special_folders[$p]) {
             $use_folder = false;
          }
       }
-      if ($boxesUnformatted[$i] == "INBOX")
-         $use_folder = false;
 
       if ($use_folder == true)
          echo "<OPTION>$boxesUnformatted[$i]\n";
diff --git a/src/webmail.php b/src/webmail.php
index 380e0cf5c39dff8155547e10b3192bf12735eed3..6970e47d6cec709a4cac0b0b8c8d9c12611b7f75 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -20,7 +20,26 @@
 OM-USA WebMail
 </TITLE>
 <FRAMESET COLS="200, *" NORESIZE BORDER=0>
-   <FRAME SRC="left_main.php" NAME="left">
-   <FRAME SRC="right_main.php" NAME="right">
+
+/**
+    There are two ways to call webmail.php
+    1.  webmail.php
+         - this just loads the default entry screen.
+    2.  webmail.php?sort=X&startMessage=X&mailbox=XXXX
+         - This loads the frames starting at the given values.
+
+    This was done to create a pure HTML way of refreshing the folder list since
+    we would like to use as little Javascript as possible.
+**/
+<?
+   if (strlen($mailbox) > 0) {
+      $urlMailbox = urlencode($mailbox);
+      echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
+      echo "<FRAME SRC=\"right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage\" NAME=\"right\">";
+   } else {
+      echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
+      echo "<FRAME SRC=\"right_main.php\" NAME=\"right\">";
+   }
+?>
 </FRAMESET>
 </HEAD></HTML>
Unnamed repository; edit this file 'description' to name the repository.