Changeset 3790 for branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

02/18/11 14:39:11 (13 years ago)

Author:

thiagoaos

Message:

Ticket #1559 - Corrigida listagem de pastas no expresso mini. Pasta rascunho não aparecia.

File:

• branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (5 diffs)

branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1717 +1717 @@
                 }
 
-
                 $inbox = 'INBOX';
                 $trash = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
@@ -1728 +1727 @@
 
                 $serverString = "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}"; 
-                $folders_list = imap_getmailboxes($mbox_stream, $serverString, ($params && $params['noSharedFolders']) ? "INBOX/*" : "*"); 
+                
                 if ( $params && $params['noSharedFolders'] )
-                        $folders_list = imap_getmailboxes($mbox_stream, $serverString, 'INBOX' ) + $folders_list;
+                        $folders_list = array_merge(imap_getmailboxes($mbox_stream, $serverString, 'INBOX' ), imap_getmailboxes($mbox_stream, $serverString, 'INBOX/*' ) );
+                else
+                        $folders_list = imap_getmailboxes($mbox_stream, $serverString, '*' );
 
                 $folders_list = array_slice($folders_list,0,$this->foldersLimit); 
@@ -1798 +1799 @@
                         if($params && $params['folder'])
                                 $current_folder = $params['folder'];
-                                
+
                         $arr_quota_info = $this->get_quota(array('folder_id' => $current_folder));
                 } else {
                         $arr_quota_info = array();
                 }
-                
+
                 // Sorting resultMine
                 foreach ($resultMine as $folder_info)
@@ -1812 +1813 @@
                 natcasesort($array_tmp);
                 
-                $result2 = array();
+                $result2 = array();
 
                 foreach ($array_tmp as $key => $folder_id)
@@ -1842 +1843 @@
                 
                 if ( $params && $params['folderType'] && $params['folderType'] == 'default' )
-                        return array_merge($resultDefault2, $arr_quota_info);           
+                        return array_merge($resultDefault2, $arr_quota_info);
 
                 if ( $params && $params['folderType'] && $params['folderType'] == 'personal' )
-                        return array_merge($result2, $arr_quota_info);  
-                        
+                        return array_merge($result2, $arr_quota_info);
+
                 // Merge default folders and personal
-                        $result2 = array_merge($resultDefault2, $result2);
+                $result2 = array_merge($resultDefault2, $result2);
                 
                 return array_merge($result2, $arr_quota_info);