Renaming works... needs serious user interface revamping... BADLY

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

diff --git a/functions/display_messages.php b/functions/display_messages.php
index bebc98bf65769eedbb173b8cc82d37fcad2d580c..87dbab9b54c7326111116e124e4b5ac4b61d1c6c 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=\"webmail.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
+      echo "              <A HREF=\"webmail.php?right_frame=right_main.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/folders.php b/src/folders.php
index 128399b2f08caca4fbc4383964c7491b0bf965b8..15ffc2074b8f15e71718f546cf956081dbe4b793 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -18,6 +18,9 @@
    getFolderList($imapConnection, $boxesFormatted, $boxesUnformatted);
 
    /** DELETING FOLDERS **/
+   echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>\n";
+   echo "<TR><TD BGCOLOR=DCDCDC ALIGN=CENTER><FONT FACE=\"Arial,Helvetica\"><B>Delete Folder</B></FONT></TD></TR>";
+   echo "<TR><TD BGCOLOR=FFFFFF ALIGN=CENTER>";
    echo "<FORM ACTION=folders_delete.php METHOD=POST>\n";
    echo "<SELECT NAME=mailbox><FONT FACE=\"Arial,Helvetica\">\n";
    for ($i = 0; $i < count($boxesUnformatted); $i++) {
@@ -25,6 +28,8 @@
       for ($p = 0; $p < count($special_folders); $p++) {
          if ($boxesUnformatted[$i] == $special_folders[$p]) {
             $use_folder = false;
+         } else if (substr($boxesUnformatted[$i], 0, strlen($trash_folder)) == $trash_folder) {
+            $use_folder = false;
          }
       }
 
@@ -33,36 +38,41 @@
    }
    echo "</SELECT>\n";
    echo "<INPUT TYPE=SUBMIT VALUE=Delete>\n";
-   echo "</FORM><BR>\n";
+   echo "</FORM><BR></TD></TR><BR>\n";
 
    /** CREATING FOLDERS **/
+   echo "<TR><TD BGCOLOR=DCDCDC ALIGN=CENTER><FONT FACE=\"Arial,Helvetica\"><B>Create Folder</B></FONT></TD></TR>";
+   echo "<TR><TD BGCOLOR=FFFFFF ALIGN=CENTER>";
    echo "<FORM ACTION=folders_create.php METHOD=POST>\n";
-   echo "<INPUT TYPE=TEXT SIZE=25 NAME=folder_name>\n";
-   echo "&nbsp;&nbsp;as a subfolder of&nbsp;&nbsp;";
+   echo "<INPUT TYPE=TEXT SIZE=25 NAME=folder_name><BR>\n";
+   echo "&nbsp;&nbsp;as a subfolder of<BR>";
    echo "<SELECT NAME=subfolder><FONT FACE=\"Arial,Helvetica\">\n";
    for ($i = 0;$i < count($boxesUnformatted); $i++) {
       echo "<OPTION>$boxesUnformatted[$i]\n";
    }
-   echo "</SELECT>\n";
+   echo "</SELECT><BR>\n";
    echo "<INPUT TYPE=SUBMIT VALUE=Create>\n";
-   echo "</FORM><BR>\n";
+   echo "</FORM><BR></TD></TR><BR>\n";
 
    /** RENAMING FOLDERS **/
+   echo "<TR><TD BGCOLOR=DCDCDC ALIGN=CENTER><FONT FACE=\"Arial,Helvetica\"><B>Rename Folder</B></FONT></TD></TR>";
+   echo "<TR><TD BGCOLOR=FFFFFF ALIGN=CENTER>";
    echo "<FORM ACTION=folders_rename.php METHOD=POST>\n";
-   echo "<SELECT NAME=folder_list><FONT FACE=\"Arial,Helvetica\">\n";
+   echo "Old:&nbsp;&nbsp;<SELECT NAME=mailbox><FONT FACE=\"Arial,Helvetica\">\n";
    for ($i = 0; $i < count($boxesUnformatted); $i++) {
       $use_folder = true;
       for ($p = 0; $p < count($special_folders); $p++) {
-         if ($special_folders[$p] == $long_name_boxes[$i])
+         if ($boxesUnformatted[$i] == $special_folders[$p]) {
             $use_folder = false;
+         }
       }
       if ($use_folder == true)
          echo "   <OPTION>$boxesUnformatted[$i]\n";
    }
-   echo "</SELECT>\n";
-   echo "<INPUT TYPE=TEXT SIZE=25 NAME=new_folder_name>\n";
+   echo "</SELECT><BR>\n";
+   echo "New:&nbsp;&nbsp;<INPUT TYPE=TEXT SIZE=25 NAME=new VALUE=\"INBOX.\"><BR>\n";
    echo "<INPUT TYPE=SUBMIT VALUE=Rename>\n";
-   echo "</FORM><BR>\n";
+   echo "</FORM></TD></TR></TABLE><BR>\n";
 
 ?>
 </BODY></HTML>

diff --git a/src/folders_create.php b/src/folders_create.php
index bf64b8a8a16c97b0d63ce7121c1cb3bb6bc5ff0a..d23b46f3b5296a973ec8c8f794e21715036063a2 100644 (file)
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -8,7 +8,7 @@
    fputs($imapConnection, "1 create \"$subfolder.$folder_name\"\n");
    fputs($imapConnection, "1 logout\n");
 
-   echo "<BR><BR><A HREF=\"folders.php\">Return</A>";
+   echo "<BR><BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>Return</A>";
 ?>
 
 

diff --git a/src/folders_delete.php b/src/folders_delete.php
index acddaf55ecedb81593984e28237f51ec23b7bda7..0561c920f8a281a884c89a3bf98c86da4c8da565 100644 (file)
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -43,7 +43,7 @@
    /** Log out this session **/
    fputs($imapConnection, "1 logout");
 
-   echo "<BR><BR><A HREF=\"folders.php\">Return</A>";
+   echo "<BR><BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>Return</A>";
 ?>
 
 

diff --git a/src/webmail.php b/src/webmail.php
index 6970e47d6cec709a4cac0b0b8c8d9c12611b7f75..060c923ca47577f527beab0538c858f4edc75ed1 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -22,20 +22,26 @@ OM-USA WebMail
 <FRAMESET COLS="200, *" NORESIZE BORDER=0>
 
 /**
-    There are two ways to call webmail.php
+    There are three ways to call webmail.php
     1.  webmail.php
          - this just loads the default entry screen.
-    2.  webmail.php?sort=X&startMessage=X&mailbox=XXXX
+    2.  webmail.php?right_frame=right_main.php&sort=X&startMessage=X&mailbox=XXXX
          - This loads the frames starting at the given values.
+    3.  webmail.php?right_frame=folders.php
+         - Loads the frames with the Folder options in the right frame.
 
     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) {
+   if ($right_frame == "right_main.php") {
       $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 if ($right_frame == "folders.php") {
+      $urlMailbox = urlencode($mailbox);
+      echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
+      echo "<FRAME SRC=\"folders.php\" NAME=\"right\">";
    } else {
       echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
       echo "<FRAME SRC=\"right_main.php\" NAME=\"right\">";