- Timestamp:
- 05/24/12 19:28:24 (12 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r6288 r6303 1109 1109 } 1110 1110 1111 if(!$this->mbox || !is_resource($this->mbox)) 1112 $this->mbox = $this->open_mbox($msg_folder); 1111 $this->mbox = $this->open_mbox($msg_folder); 1113 1112 1114 1113 $header = $this->get_header($msg_number); … … 3446 3445 { 3447 3446 $folder = $params['folder']; 3448 $newmailbox = mb_convert_encoding($params['new_folder'], "UTF7-IMAP", ( isset($params['decoded']) ? "" : "ISO-8859-1, " )."UTF-8, UTF7-IMAP" ); 3449 $new_folder_name = isset($params['decoded']) ? mb_convert_encoding($params['new_folder'], "ISO-8859-1", "UTF-8" ) : $params['new_folder_name']; 3447 $mbox_stream = $this->open_mbox($folder); 3448 $newmailbox = ($params['new_folder']); 3449 $newmailbox = mb_convert_encoding($newmailbox, "UTF7-IMAP","ISO-8859-1, UTF-8, UTF7-IMAP"); 3450 $new_folder_name = $params['new_folder_name']; 3450 3451 $msgs_number = $params['msgs_number']; 3451 3452 $return = array('msgs_number' => $msgs_number, … … 3591 3592 function set_messages_flag($params) 3592 3593 { 3593 $folder = ( isset($params['decoded']) ) ? $params['folder'] : mb_convert_encoding($params['folder'], "UTF7-IMAP", "ISO-8859-1, UTF-8, UTF7-IMAP");3594 $folder = mb_convert_encoding($params['folder'], "UTF7-IMAP","UTF-8, ISO-8859-1, UTF7-IMAP"); 3594 3595 $msgs_to_set = $params['msgs_to_set']; 3595 3596 $flag = $params['flag']; -
trunk/prototype/modules/attach_message/attach_message.js
r6301 r6303 413 413 } 414 414 415 var tabPanelTemplateId = 'mailpreview_tab_' + selectedFolder.id.replace(/[.\/]/ , '_') + '_' + message.msg_number;415 var tabPanelTemplateId = 'mailpreview_tab_' + selectedFolder.id.replace(/[.\/]/g, '_') + '_' + message.msg_number; 416 416 var tabPanelTemplateId = tabPanelTemplateId.replace(/[\s\/]/g, '-'); 417 417 -
trunk/prototype/services/ImapServiceAdapter.php
r6265 r6303 403 403 { 404 404 case 'message': 405 { 405 { 406 406 return $this->to_utf8( 407 407 $this->get_info_msg( array('msg_number'=>$URI['id'], 408 'msg_folder'=>str_replace( '.', $this->imap_delimiter, $justthese['context']['folder'] )) ) 408 'msg_folder'=>str_replace( '.', $this->imap_delimiter, $justthese['context']['folder'] ) , 409 'decoded' => true ) ) 409 410 ); 410 411 }
Note: See TracChangeset
for help on using the changeset viewer.