X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=34dc7f45906da04a55419a0b582e3cba5a1d80ae;hb=e0dcff78e5469c8dc71cc603dff6326fc4f7b3c2;hp=4052a9a33d5aed88eee62352621eb7300cf1cdef;hpb=9f5152fc5867168a6c404cf5fc17dd6298f6927d;p=squirrelmail.git

diff --git a/src/folders.php b/src/folders.php
index 4052a9a3..34dc7f45 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -12,12 +12,10 @@
     **  $Id$
     **/
 
-   include('../src/validate.php');
-   include("../functions/page_header.php");
-   include("../functions/imap.php");
-   include("../functions/array.php");
-   include("../functions/plugin.php");
-   include("../src/load_prefs.php");
+   require_once('../src/validate.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/array.php');
+   require_once('../functions/plugin.php');
 
    displayPageHeader($color, _("None"));
 
@@ -49,16 +47,6 @@
          echo "<b>" . _("Created folder successfully!") . "</b><br>";
       } else if ($success == "rename") {
          echo "<b>" . _("Renamed successfully!") . "</b><br>";
-      } else if (($sent_create == "true") || ($trash_create == "true")) {
-         $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-         if ($sent_create == "true") {
-            sqimap_mailbox_create ($imapConnection, $sent_folder, "");  
-         }
-         if ($trash_create == "true") {
-            sqimap_mailbox_create ($imapConnection, $trash_folder, "");
-         }
-         sqimap_logout($imapConnection);
-         echo _("Folders created successfully!");
       }
 
       echo "   <a href=\"../src/left_main.php\" target=left>" . _("refresh folder list") . "</a>";
@@ -68,28 +56,6 @@
    $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
    $boxes = sqimap_mailbox_list($imapConnection);
 
-   //display form option for creating Sent and Trash folder
-   if ($imap_server_type == "cyrus" && ($sent_folder != "none" || $trash_folder != "none")) {
-      if ((!sqimap_mailbox_exists ($imapConnection, $sent_folder)) || 
-	  (!sqimap_mailbox_exists ($imapConnection, $trash_folder))) {
-         echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=2 cellspacing=0 border=0>\n";
-         echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><B>";
-         echo _("Special Folder Options");
-         echo "</B></TD></TR>";
-         echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
-         echo _("In order for SquirrelMail to provide the full set of options you need to create the special folders listed below.  Just click the check box and hit the create button.");
-         echo "<FORM ACTION=\"folders.php\" METHOD=\"POST\">\n";
-         if (!sqimap_mailbox_exists ($imapConnection, $sent_folder) && $sent_folder != "none") {
-            echo _("Create Sent") . "<INPUT TYPE=checkbox NAME=sent_create value=true><br>\n";
-         }
-         if (!sqimap_mailbox_exists ($imapConnection, $trash_folder) && $trash_folder != "none"){
-            echo _("Create Trash") . "<INPUT TYPE=checkbox NAME=trash_create value=true><br>\n";
-         }
-         echo "<INPUT TYPE=submit VALUE="._("Create").">";
-         echo "</FORM></TD></TR></TABLE><br>";
-      }
-   }
-
    /** DELETING FOLDERS **/
    echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=2 cellspacing=0 border=0>\n";
    echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><B>";
@@ -250,7 +216,7 @@
    $boxes_sub = $boxes;
 
    /** SUBSCRIBE TO FOLDERS **/
-   echo "<TD BGCOLOR=\"$color[0]\" widtn=50% ALIGN=CENTER>";
+   echo "<TD BGCOLOR=\"$color[0]\" width=50% ALIGN=CENTER>";
    $imap_stream = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 1);
    $boxes_all = sqimap_mailbox_list_all ($imap_stream);
 
@@ -303,4 +269,4 @@
    sqimap_logout($imapConnection);
 ?>
 
-</body></html>
+</body></html>
\ No newline at end of file