Changeset 5175

Timestamp:

11/14/11 14:00:23 (12 years ago)

Author:

gustavo

Message:

Ticket #2313 - Pastas fixas do IMAP estão fora de ordem

File:

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

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

@@ -2354 +2354 @@
                 $spam = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'];
                 $trash = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
+
                 if(array_key_exists('uid2cn', $_SESSION['phpgw_info']['user']['preferences']['expressoMail'] ))
                 $uid2cn = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['uid2cn']; 
@@ -2391 +2392 @@
                                 $folderUser = trim( strpos( $tmp_folder_id[1], $this->imap_delimiter , 5 ) );
 
-                            $folderUser = trim( substr( $tmp_folder_id[1], 0, $folderUser ) );
-
-                            $Permission = true;
-
-                            if( $folderUser != "INBOX" && $folderUser != "" )
-                            {
-                               $Permission = @imap_getacl( $mbox_stream, $folderUser );
-                            }
-                                $tmp_folder_id[1] = mb_convert_encoding( $tmp_folder_id[1], "ISO-8859-1", "UTF7-IMAP" );
-
-                                if( $tmp_folder_id[1]=='INBOX'.$this->imap_delimiter.'decifradas')
-                                {
+                                $folderUser = trim( substr( $tmp_folder_id[1], 0, $folderUser ) );
+
+                                $Permission = true;
+
+                                if( $folderUser != "INBOX" && $folderUser != "" )
+                                {
+                                        $Permission = @imap_getacl( $mbox_stream, $folderUser );
+                                }
+                                $tmp_folder_id[1] = mb_convert_encoding( $tmp_folder_id[1], "ISO-8859-1", "UTF7-IMAP" );
+
+                                if( $tmp_folder_id[1]=='INBOX'.$this->imap_delimiter.'decifradas')
+                                {
                                         continue;
                                 }
                                 
                                 if(isset($status->unseen))
-                                $result[$i]['folder_unseen'] = $status->unseen;
+                                        $result[$i]['folder_unseen'] = $status->unseen;
                                 
                                 $folder_id = $tmp_folder_id[1];
@@ -2454 +2455 @@
                                         default:
                                                 if($user[0] == $inbox)
-                                                $resultMine[]=$result[$i];
+                                                        $resultMine[]=$result[$i];
                                                 else{
                                                         if($aux != $user[1]){
@@ -2463 +2464 @@
                                                                 $resultSharedMine[$qtd] = array();
                                                         $resultSharedMine[$qtd][]=$result[$i];
-                                }
-
-                            }
+                                                }
+
+                                }
                             $i++;
-                        }
+                        }
                 }
 
@@ -2497 +2498 @@
                 
                 // Sorting resultDefault
+                $resultDefault2 = array();
+                
                 foreach ($resultDefault as $key => $folder_id)
                 {
+
                         switch ($resultDefault[$key]['folder_id']) {
                                 case $inbox: 
@@ -2517 +2521 @@
                         }
                 }
-                
+                //RE-ORDENA INDICES
+                ksort($resultDefault2);
                 $shareds = array();
                 if(!empty($resultSharedDefault))
@@ -2549 +2554 @@
                         $resultSharedDefault2 = array();
                 }
+ob_start();
+print_r( "=== LOG BEGIN ===" . "\n" );
+print_r( "resultDefault2 : " . "\n" );
+print_r( var_export($resultDefault2) . "\n" );
+$output = ob_get_clean();
+file_put_contents( '/tmp/log-gustavo2.txt', file_get_contents( '/tmp/log-gustavo2.txt' ) . $output );
                 if ( $params && isset($params['folderType']) && $params['folderType'] == 'default' )
                         return array_merge($resultDefault2, $arr_quota_info);