Fixed typo.

[squirrelmail.git] / src / folders.php

diff --git a/src/folders.php b/src/folders.php
index 275a4c3dbfebbd4b82d1de6abf98c845d2e99944..308296a5e310bd8df98efd940393ad24c9f29fd8 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -1,23 +1,40 @@
 <?php
-   /**
-    **  folders.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Handles all interaction between the user and the other folder
-    **  scripts which do most of the work. Also handles the Special
-    **  Folders.
-    **
-    **  $Id$
-    **/
-
-   include('../src/validate.php');
-   include("../functions/imap.php");
-   include("../functions/array.php");
-   include("../functions/plugin.php");
-
-   displayPageHeader($color, _("None"));
+
+/**
+ * folders.php
+ *
+ * Copyright (c) 1999-2001 The Squirrelmail Development Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Handles all interaction between the user and the other folder
+ * scripts which do most of the work. Also handles the Special
+ * Folders.
+ *
+ * $Id$
+ */
+
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the require_once below looks.                        ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
+
+require_once('../src/validate.php');
+require_once('../functions/imap.php');
+require_once('../functions/array.php');
+require_once('../functions/plugin.php');
+
+   displayPageHeader($color, 'None');
 
 ?>
 
@@ -69,6 +86,8 @@
                $num_max++;
        if ($move_to_sent)
                $num_max++;
+       if ($save_as_draft)
+               $num_max++;
 
    for ($p = 0; $p < count($boxes) && $count_special_folders < $num_max; $p++) {                                                                                 
       if (strtolower($boxes[$p]["unformatted"]) == "inbox")
@@ -80,6 +99,8 @@
          $count_special_folders++;
       else if ($boxes[$p]["unformatted"] == $sent_folder && $sent_folder)
          $count_special_folders++;
+      else if ($boxes[$p]["unformatted"] == $draft_folder && $draft_folder)
+         $count_special_folders++;
    }   
 
    if ($count_special_folders < count($boxes)) {
@@ -90,6 +111,7 @@
         if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
             ($boxes[$i]["unformatted"] != $trash_folder) && 
             ($boxes[$i]["unformatted"] != $sent_folder) &&
+             ($boxes[$i]["unformatted"] != $draft_folder) &&
             (strtolower($imap_server_type) != "courier" ||
              strtolower($boxes[$i]["unformatted"]) != "inbox.trash"))
            {
@@ -165,7 +187,8 @@
 
         if ((strtolower($boxes[$i]["unformatted"]) != "inbox") && 
             ($boxes[$i]["unformatted"] != $trash_folder)  &&
-            ($boxes[$i]["unformatted"] != $sent_folder)) 
+            ($boxes[$i]["unformatted"] != $sent_folder) &&
+             ($boxes[$i]["unformatted"] != $draft_folder))
            {   
               $box = $boxes[$i]["unformatted-dm"];
               $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
@@ -198,7 +221,8 @@
          $use_folder = true;
         if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
             ($boxes[$i]["unformatted"] != $trash_folder) &&
-            ($boxes[$i]["unformatted"] != $sent_folder)) 
+            ($boxes[$i]["unformatted"] != $sent_folder) &&
+             ($boxes[$i]["unformatted"] != $draft_folder))
            {   
               $box = $boxes[$i]["unformatted-dm"];
               $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);