removed some buggy UW specific code -- subscribed folders now show with UW again.

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

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index de9ce022e9ec81c35bb612a5164a668777c6617b..c5a147c81a71a3ef0eba7502695e15d2705df88b 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -117,7 +117,7 @@
       for ($g=0; $g < count($line); $g++) {
          $boxes[$g]["raw"] = $line[$g];
             
-         $mailbox = $line_lsub[$g];
+         $mailbox = trim($line_lsub[$g]);
          $dm_count = countCharInString($mailbox, $dm);
          if (substr($mailbox, -1) == $dm)
             $dm_count--;
@@ -147,7 +147,7 @@
     ******************************************************************************/
    function sqimap_mailbox_list ($imap_stream) {
       global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username, $list_special_folders_first;
-      global $trash_folder, $sent_folder, $imap_server_type;
+      global $trash_folder, $sent_folder;
       global $move_to_trash, $move_to_sent;
 
       $inbox_in_list = false;
@@ -161,14 +161,9 @@
 
       /** LSUB array **/
       $inbox_subscribed = false;
-      if ($imap_server_type == "uw") {
-         fputs ($imap_stream, "a001 LSUB \"~\" \"*\"\r\n");
-      }
-      else {
-         fputs ($imap_stream, "a001 LSUB \"\" \"*\"\r\n");
-      }
+      fputs ($imap_stream, "a001 LSUB \"\" \"*\"\r\n");
       $lsub_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-   
+
       for ($i=0;$i < count($lsub_ary); $i++) {
          $sorted_lsub_ary[$i] = find_mailbox_name($lsub_ary[$i]);
          if ($sorted_lsub_ary[$i] == "INBOX")