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

Timestamp:

02/15/11 11:24:24 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1548 - Corrigido exibição de subpastas na arvore de editar pastas do expressoMail

File:

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

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

@@ -1724 +1724 @@
                 if ( $params && $params['noSharedFolders'] )
                         $folders_list = imap_getmailboxes($mbox_stream, $serverString, 'INBOX' ) + $folders_list;
-                        
+
                 $folders_list = array_slice($folders_list,0,$this->foldersLimit); 
 
@@ -1732 +1732 @@
 
                 if (is_array($folders_list)) {
-                        reset($folders_list);
-                        $this->ldap = new ldap_functions();
+                        reset($folders_list);
+                        $this->ldap = new ldap_functions();
 
                         $i = 0;
-                        while (list($key, $val) = each($folders_list)) {
-                                $status = imap_status($mbox_stream, $val->name, SA_UNSEEN);
-
-                                //$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];
+                        while (list($key, $val) = each($folders_list)) {
+                                $status = imap_status($mbox_stream, $val->name, SA_UNSEEN);
+
+                                //$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];
                                 $result[$i]['folder_id'] = $folder_id;
 
@@ -1753 +1754 @@
                                 $result[$i]['folder_name'] = array_pop($tmp_folder_parent);
                                 $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name'];
+                        
                                 if ($uid2cn && substr($folder_id,0,4) == 'user') {
                                         //$this->ldap = new ldap_functions();
@@ -1774 +1776 @@
                                         case $spam:
                                         case $trash:
-                                                $resultDefault[]=$result[$i];
-                                                break;
+                                                $resultDefault[]=$result[$i];
+                                                break;
                                         default:
-                                                $resultMine[]=$result[$i];
+                                                $resultMine[]=$result[$i];
                                 }
 
                                 $i++;
-                        }
+                        }
                 }