Changeset 6303 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php
- Timestamp:
- 05/24/12 19:28:24 (12 years ago)
- File:
-
- 1 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'];
Note: See TracChangeset
for help on using the changeset viewer.