Now treats drafts folder as a special folder.

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

diff --git a/AUTHORS b/AUTHORS
index 421eede56ca36f1b4645d44da1b86415570cb7bc..7fd5ef3d2c856dac1dcdc7ce070bf8701305a972 100644 (file)
Binary files a/AUTHORS and b/AUTHORS differ

diff --git a/src/folders.php b/src/folders.php
index 950276efb45695f380a8db4f295cf727c965796c..4a36e8b71d50eaa006ffb8b69a9f02dbf41c0fe6 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -86,6 +86,8 @@ require_once('../functions/plugin.php');
                $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")
@@ -97,6 +99,8 @@ require_once('../functions/plugin.php');
          $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_folder++;
    }   
 
    if ($count_special_folders < count($boxes)) {
@@ -107,6 +111,7 @@ require_once('../functions/plugin.php');
         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"))
            {
@@ -182,7 +187,8 @@ require_once('../functions/plugin.php');
 
         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"]);
@@ -215,7 +221,8 @@ require_once('../functions/plugin.php');
          $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"]);