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

Timestamp:

12/02/10 09:35:51 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1404 - Criada a página de login do Expresso Mini.

File:

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

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

@@ -1676 +1676 @@
      * Se usar $params['noSharedFolders'] = true, ira retornar todas as pastas do usuário logado,
      * excluindo as compartilhadas para ele.
+     * Se usar $params['folderType'] = "default" irá retornar somente as pastas defaults
+     * Se usar $params['folderType'] = "personal" irá retornar somente as pastas pessoais
+     * Se usar $params['folderType'] = null irá retornar todas as pastas
      * @return Retorna um array contendo as seguintes informacoes de cada pasta: folder_unseen,
      * folder_id, folder_name, folder_parent e folder_hasChildren.
@@ -1700 +1703 @@
                 if ( $params && $params['noSharedFolders'] )
                         $folders_list = imap_getmailboxes($mbox_stream, $serverString, 'INBOX' ) + $folders_list;
+                        
                 $folders_list = array_slice($folders_list,0,$this->foldersLimit); 
 
@@ -1716 +1720 @@
                                 //$tmp_folder_id = explode("}", imap_utf7_decode($val->name));
                                 $tmp_folder_id = explode("}", mb_convert_encoding($val->name, "ISO_8859-1", "UTF7-IMAP" ));
-                                if($tmp_folder_id[1]=='INBOX'.$this->imap_delimiter.'decifradas') {
-                                        //error_log('passou', 3,'/tmp/imap_get_list.log');
-                                        //imap_deletemailbox($mbox_stream,imap_utf7_encode("{".$this->imap_server."}".'INBOX/decifradas'));
-                                        continue;
-                                }
-                                $result[$i]['folder_unseen'] = $status->unseen;
-                                $folder_id = $tmp_folder_id[1];
+                if($tmp_folder_id[1]=='INBOX'.$this->imap_delimiter.'decifradas') {
+                        //error_log('passou', 3,'/tmp/imap_get_list.log');
+                        //imap_deletemailbox($mbox_stream,imap_utf7_encode("{".$this->imap_server."}".'INBOX/decifradas'));
+                        continue;
+                }
+                $result[$i]['folder_unseen'] = $status->unseen;
+                                $folder_id = $tmp_folder_id[1];
                                 $result[$i]['folder_id'] = $folder_id;
 
@@ -1750 +1754 @@
                                         case $trash:
                                                 $resultDefault[]=$result[$i];
+                                                break;
                                         default:
                                                 $resultMine[]=$result[$i];
@@ -1758 +1763 @@
                 }
 
+                //Get quota info of current folder
+                $current_folder = "INBOX";
+                if($params && $params['folder'])
+                        $current_folder = $params['folder'];
+                        
+                $arr_quota_info = $this->get_quota(array('folder_id' => $current_folder));              
+                
                 // Sorting resultMine
                 foreach ($resultMine as $folder_info)
@@ -1771 +1783 @@
                 }
                 
-                $resultDefault2=$resultDefault;
                 // Sorting resultDefault
                 foreach ($resultDefault as $key => $folder_id)
                 {
-
                         switch ($resultDefault[$key]['folder_id']) {
                                 case $inbox: 
@@ -1794 +1804 @@
                         }
                 }
-
-                // Merge default folders and mines
+                
+                if ( $params && $params['folderType'] && $params['folderType'] == 'default' )
+                        return array_merge($resultDefault2, $arr_quota_info);           
+
+                if ( $params && $params['folderType'] && $params['folderType'] == 'personal' )
+                        return array_merge($result2, $arr_quota_info);  
+                        
+                // Merge default folders and personal
                 $result2 = array_merge($resultDefault2, $result2);
                 
-                $current_folder = "INBOX";
-                if($params && $params['folder'])
-                        $current_folder = $params['folder'];
-                return array_merge($result2, $this->get_quota(array('folder_id' => $current_folder)));
+                return array_merge($result2, $arr_quota_info);
         }