fixed warning

[squirrelmail.git] / functions / imap_mailbox.php

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 73852cd9a5b8475d0dacf8aa451647d9ac03d282..5f42748fc14fa5781f6ffb3a9b75b61a06a96081 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -42,7 +42,7 @@ class mailboxes {
                 } else {
                     $no_select_mbx->mailboxname_full = $ary[$i];
                 }
-                $no_select_mbx->mailboxname_sub = imap_utf7_decode_local($ary[$i]);
+                $no_select_mbx->mailboxname_sub = $ary[$i];
                 $no_select_mbx->is_noselect = true;
                 $mbx_parent->mbxs[] = $no_select_mbx;
                 $i--;
@@ -84,7 +84,7 @@ function find_mailbox_name ($mailbox) {
 }
 
 function check_is_noselect ($lsub_line) {
-    return preg_match("/^\* LSUB \([^\)]*\\Noselect[^\)]*\)/i", $lsub_line);
+    return preg_match("/^\* (LSUB|LIST) \([^\)]*\\Noselect[^\)]*\)/i", $lsub_line);
 }
 
 /**
@@ -707,7 +707,8 @@ function sqimap_mailbox_tree($imap_stream) {
     if (!isset($boxesnew)) {
 
         global $data_dir, $username, $list_special_folders_first,
-               $folder_prefix, $delimiter, $trash_folder, $move_to_trash;
+               $folder_prefix, $delimiter, $trash_folder, $move_to_trash,
+               $imap_server_type;
 
 
         $inbox_in_list = false;
@@ -763,6 +764,14 @@ function sqimap_mailbox_tree($imap_stream) {
             }
 
             $mbx = find_mailbox_name($lsub_ary[$i]);
+
+            // Force a list for UW as it returns \NoSelect in LIST and not LSUB //
+            if ($imap_server_type == "uw") {                
+                $tmp_str = sqimap_run_command( $imap_stream , "LIST \"\" \"$mbx\"" , true, $response, $message );
+                if (isset($tmp_str[0])) {
+                    $lsub_ary[$i] = $tmp_str[0];
+                }
+            }
             $noselect = check_is_noselect($lsub_ary[$i]);
             if (substr($mbx, -1) == $delimiter) {
                 $mbx = substr($mbx, 0, strlen($mbx) - 1);
@@ -814,9 +823,6 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false) {
     $trail_del = false;
     $start = 0;
 
-/* JA - Seems to really screw up folder displays, courier and uw both lose their INBOX when you
-        have a default_folder_prefix set on this
-
 
     if (isset($folder_prefix) && ($folder_prefix != '')) {
         $start = substr_count($folder_prefix,$delimiter);
@@ -831,7 +837,6 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false) {
     } else {
         $start = 0;
     }
-*/
 
     $cnt =  count($mbx_ary);
     for ($i=0; $i < $cnt; $i++) {
@@ -868,16 +873,27 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false) {
 
             $r_del_pos = strrpos($mbx_ary[$i]['mbx'], $delimiter);
             if ($r_del_pos) {
-                $mbx->mailboxname_sub = imap_utf7_decode_local(substr($mbx_ary[$i]['mbx'],$r_del_pos+1));
+                $mbx->mailboxname_sub = substr($mbx_ary[$i]['mbx'],$r_del_pos+1);
             } else {   /* mailbox is root folder */
-                $mbx->mailboxname_sub = imap_utf7_decode_local($mbx_ary[$i]['mbx']);
+                $mbx->mailboxname_sub = $mbx_ary[$i]['mbx'];
             }
             $mbx->mailboxname_full = $mbx_ary[$i]['mbx'];
 
             $mailboxes->addMbx($mbx, $delimiter, $start, $list_special_folders_first);
         }
     }
+    sqimap_utf7_decode_mbx_tree($mailboxes);
     return $mailboxes;
 }
 
+function sqimap_utf7_decode_mbx_tree(&$mbx_tree) {
+   $mbx_tree->mailboxname_sub=imap_utf7_decode_local($mbx_tree->mailboxname_sub);
+   if ($mbx_tree->mbxs) {
+      $iCnt = count($mbx_tree->mbxs);
+      for ($i=0;$i<$iCnt;++$i) {
+         $mbxs_tree->mbxs[$i] = sqimap_utf7_decode_mbx_tree($mbx_tree->mbxs[$i]);
+      }
+   }
+}      
+
 ?>