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 58519b78000ffe3ca653ebc31dcee57b88ba4197..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);
    }
@@ -92,6 +106,7 @@
     **  Formats a mailbox into 4 parts for the $boxes array
     ******************************************************************************/
    function sqimap_mailbox_parse ($line, $dm) {
+               global $folder_prefix;
       for ($g=0; $g < count($line); $g++) {
          $boxes[$g]["raw"] = $line[$g];
             
@@ -100,7 +115,7 @@
          if (substr($mailbox, -1) == $dm)
             $dm_count--;
             
-         for ($j = 0; $j < $dm_count; $j++)
+         for ($j = 0; $j < $dm_count - (countCharInString($folder_prefix, $dm)); $j++)
             $boxes[$g]["formatted"] = $boxes[$g]["formatted"] . "  ";
          $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
             
@@ -117,7 +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>";
+                               }
+                       }
+                       ****/
       }
       return $boxes;
    }
@@ -127,7 +149,12 @@
     **  The array returned looks like this:
     ******************************************************************************/
    function sqimap_mailbox_list ($imap_stream) {
-      global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username;
+      global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username, $list_special_folders_first;
+               global $trash_folder, $sent_folder;
+               global $move_to_trash, $move_to_sent;
+
+      $inbox_in_list = false;
+      $inbox_subscribed = false;
 
       if (!isset($load_prefs_php)) include "../src/load_prefs.php";
       else global $folder_prefix;
@@ -138,10 +165,11 @@
       /** LIST array **/
       fputs ($imap_stream, "a001 LIST \"\" \"$folder_prefix*\"\r\n");
       $list_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+
       for ($i=0;$i < count($list_ary); $i++) {
          $sorted_list_ary[$i]["name"] = find_mailbox_name($list_ary[$i]);
          $sorted_list_ary[$i]["raw"]  = $list_ary[$i];
-         if ($sorged_list_ary[$i]["name"] == "INBOX")
+         if ($sorted_list_ary[$i]["name"] == "INBOX")
             $inbox_in_list = true;
       }
       if (isset($sorted_list_ary)) {
@@ -194,48 +222,33 @@
              }
       }
 
-      return sqimap_mailbox_parse ($merged, $dm);
-   }
-   
-/*
-      $original = $boxes;
-
-      for ($i = 0; $i < count($original); $i++) {
-         $boxes[$i]["unformatted"] = strtolower($boxes[$i]["unformatted"]);
-      }
-
-      $boxes = ary_sort($boxes, "unformatted", 1);
-
-      for ($i = 0; $i < count($boxes); $i++) {
-         for ($j = 0; $j < count($original); $j++) {
-            if ($boxes[$i]["id"] == $original[$j]["id"]) {
-               $boxes[$i] = $original[$j];
-            }
-         }
-      }     
- 
-      
+               $boxes = sqimap_mailbox_parse ($merged, $dm);
+               
+               /** 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;
          }
       }
-      
+
       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"], 0, 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];
@@ -245,13 +258,12 @@
 
       return $boxesnew;
    }
-   */
    
    /******************************************************************************
     **  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");