Changeset 6305


Ignore:
Timestamp:
05/24/12 20:45:28 (8 years ago)
Author:
natan
Message:

Ticket #2800 - Inconsistência ao mover mensagens de pastas compartilhadas acentuadas - Corrigido

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/inc/class.imap_functions.inc.php

    r6304 r6305  
    34463446                $folder = $params['folder']; 
    34473447                $newmailbox = mb_convert_encoding($params['new_folder'], "UTF7-IMAP", ( isset($params['decoded']) ? "" : "ISO-8859-1, " )."UTF-8, UTF7-IMAP" ); 
    3448                 $new_folder_name = isset($params['decoded']) ? mb_convert_encoding($params['new_folder'], "ISO-8859-1", "UTF-8" ) : $params['new_folder_name']; 
     3448                $new_folder_name = isset($params['decoded']) ? mb_convert_encoding($params['new_folder_name'], "ISO-8859-1", "UTF-8" ) : $params['new_folder_name']; 
    34493449                $msgs_number = $params['msgs_number']; 
    34503450                $return = array('msgs_number' => $msgs_number, 
     
    34563456                //Este bloco tem a finalidade de averiguar as permissoes para pastas compartilhadas 
    34573457        if (substr($folder,0,4) == 'user'){ 
    3458                 $acl = $this->getacltouser($folder); 
     3458                $acl = $this->getacltouser($folder, isset($params['decoded'])); 
    34593459                /* 
    34603460                 *   l - lookup (mailbox is visible to LIST/LSUB commands) 
     
    44744474        } 
    44754475 
    4476         function getacltouser($user) 
     4476        function getacltouser($user, $decode = false) 
    44774477        { 
    44784478                $return = array(); 
    4479                 $mbox_stream = $this->open_mbox();       
     4479                $mbox_stream = $this->open_mbox(); 
     4480                 
     4481                if( $decode ) 
     4482                    $user = mb_convert_encoding($user, 'UTF7-IMAP','UTF-8, ISO-8859-1, UTF7-IMAP'); 
    44804483                 
    44814484                //Alterado, antes era 'imap_getacl($mbox_stream, 'user'.$this->imap_delimiter.$user); 
Note: See TracChangeset for help on using the changeset viewer.