Fixed a glich that caused the 'Viewing message' line to show a strange colour when...

[squirrelmail.git] / functions / imap_mailbox.php

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index ecb5dd24c0308ff3b30d046e4efc52e3521ce853..018f2737c74cdb8687e94a4da30f69d3841d0658 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -71,6 +71,20 @@
     **  Unsubscribes to an existing folder 
     ******************************************************************************/
    function sqimap_unsubscribe ($imap_stream, $mailbox) {
+               global $imap_server_type;
+
+               /** This is a hack for UW server
+                **    Sometimes a folder will have a / at the end.  If that's the case,
+                **    the unsubscribe doesn't work for a box named "mailbox/".  We have
+                **    to strip off the / at the end.  There may be a better way of doing
+                **    this, but this is the best I've found so far.  (lme - April 26, 2000)
+                **/
+               if ($imap_server_type == "uw") {
+                       if (substr($mailbox, -1) == "/") {
+                               $mailbox = substr($mailbox, 0, strlen($mailbox)-1);
+                       }
+               }       
+
       fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\r\n");
       $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
    }
@@ -118,12 +132,14 @@
          if ($flags) {
             $boxes[$g]["flags"] = explode(" ", $flags);
          }
+                       /****  I'm not sure why this was even in here to begin with..  (lme)
                        for ($i=0; $i < count($boxes[$g]["flags"]); $i++) {
                                if ($boxes[$g]["flags"][$i] == "noselect") {
                                        $boxes[$g]["unformatted-dm"] = $boxes[$g]["unformatted-dm"].$dm;
-                                       echo $boxes[$g]["unformatted-dm"]." - debug<br>";
+//                                     echo $boxes[$g]["unformatted-dm"]." - debug<br>";
                                }
                        }
+                       ****/
       }
       return $boxes;
    }
@@ -134,7 +150,8 @@
     ******************************************************************************/
    function sqimap_mailbox_list ($imap_stream) {
       global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username, $list_special_folders_first;
-               global $special_folders;
+               global $trash_folder, $sent_folder;
+               global $move_to_trash, $move_to_sent;
 
       $inbox_in_list = false;
       $inbox_subscribed = false;
@@ -209,7 +226,7 @@
                
                /** Now, lets sort for special folders **/
       for ($i = 0; $i < count($boxes); $i++) {
-         if ($boxes[$i]["unformatted"] == $special_folders[0]) {
+         if (strtolower($boxes[$i]["unformatted"]) == "inbox") {
             $boxesnew[0] = $boxes[$i];
             $boxes[$i]["used"] = true;
          }
@@ -217,18 +234,21 @@
 
       if ($list_special_folders_first == true) {
          for ($i = 0; $i < count($boxes); $i++) {
-            for ($j = 1; $j < count($special_folders); $j++) {
-               if (substr($boxes[$i]["unformatted"], strlen($folder_prefix), strlen($special_folders[$j])) == $special_folders[$j]) {
-                  $pos = count($boxesnew);
-                  $boxesnew[$pos] = $boxes[$i];
-                  $boxes[$i]["used"] = true;
-               }
+                               if (($boxes[$i]["unformatted"] == $trash_folder) && ($move_to_trash)) { 
+               $pos = count($boxesnew);
+               $boxesnew[$pos] = $boxes[$i];
+               $boxes[$i]["used"] = true;
+            }
+                               else if (($boxes[$i]["unformatted"] == $sent_folder) && ($move_to_sent)) {      
+               $pos = count($boxesnew);
+               $boxesnew[$pos] = $boxes[$i];
+               $boxes[$i]["used"] = true;
             }
          }
       }
                
       for ($i = 0; $i < count($boxes); $i++) {
-         if (($boxes[$i]["unformatted"] != $special_folders[0]) &&
+         if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
              ($boxes[$i]["used"] == false))  {
             $pos = count($boxesnew);
             $boxesnew[$pos] = $boxes[$i];
@@ -243,7 +263,7 @@
     **  Returns a list of all folders, subscribed or not
     ******************************************************************************/
    function sqimap_mailbox_list_all ($imap_stream) {
-      global $special_folders, $list_special_folders_first, $folder_prefix;
+      global $list_special_folders_first, $folder_prefix;
       
       if (!function_exists ("ary_sort"))
          include ("../functions/array.php");