Changeset 1375 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

08/27/09 17:56:52 (15 years ago)

Author:

niltonneto

Message:

Ticket #620 - Corrigido problema quando pasta "user" é criada no IMAP.

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1389 +1389 @@
     }
 
+         /**
+     * Metodo que retorna todas as pastas do usuario logado.
+     * @param $params array opcional para repassar os argumentos ao metodo.
+     * Se usar $params['noSharedFolders'] = true, ira retornar todas as pastas do usuário logado,
+     * excluindo as compartilhadas para ele.
+     * @return Retorna um array contendo as seguintes informacoes de cada pasta: folder_unseen, 
+     * folder_id, folder_name, folder_parent e folder_hasChildren.
+     */ 
         function get_folders_list($params = null)
         {
                 $mbox_stream = $this->open_mbox();              
                 $serverString = "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}";
-                $folders_list = imap_getmailboxes($mbox_stream, $serverString, "*");
+                $folders_list = imap_getmailboxes($mbox_stream, $serverString, ($params && $params['noSharedFolders']) ? "INBOX/*" : "*");
                 $folders_list = array_slice($folders_list,0,$this->foldersLimit);
 
@@ -1421 +1429 @@
                                 $result[$i]['folder_name'] = array_pop($tmp_folder_parent);
                                 $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name'];
-                                if (is_numeric($result[$i]['folder_name']))     {
+                                if (substr($folder_id,0,4) == 'user' && is_numeric($result[$i]['folder_name'])) {
                                         //$this->ldap = new ldap_functions();
                                         if ($cn = $this->ldap->uid2cn($result[$i]['folder_name'])){
@@ -2150 +2158 @@
         }
         //Este bloco tem a finalidade de transformar o CPF das pastas compartilhadas em common name
-        if (substr($new_folder_name,0,4) == 'user'){
+        if (substr($new_folder_name,0,4) == 'user'){            
                 $this->ldap = new ldap_functions();
                 $tmp_folder_name = explode($this->imap_delimiter, $new_folder_name);