Changeset 4587 for branches/2.2/expressoMail1_2
- Timestamp:
- 06/06/11 10:36:32 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php
r4583 r4587 52 52 function open_mbox($folder = False,$force_die=true) 53 53 { 54 $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO _8859-1");54 $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO-8859-1"); 55 55 if (is_resource($this->mbox)) 56 56 { … … 120 120 121 121 if(!$search_box_type || $search_box_type=="UNSEEN" || $search_box_type=="SEEN") { 122 $msgs_info = imap_status($this->mbox,"{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".mb_convert_encoding( $folder, "UTF7-IMAP", "ISO _8859-1" ) ,SA_ALL);122 $msgs_info = imap_status($this->mbox,"{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".mb_convert_encoding( $folder, "UTF7-IMAP", "ISO-8859-1" ) ,SA_ALL); 123 123 124 124 … … 335 335 $invalid_format = false; 336 336 $filename = $params['FILES'][0]['name']; 337 $params["folder"] = mb_convert_encoding($params["folder"], "UTF7-IMAP","ISO _8859-1");337 $params["folder"] = mb_convert_encoding($params["folder"], "UTF7-IMAP","ISO-8859-1"); 338 338 $quota = imap_get_quotaroot($this->mbox, $params["folder"]); 339 339 if((($quota['limit'] - $quota['usage'])*1024) <= $params['FILES'][0]['size']){ … … 1809 1809 if( $Permission ) 1810 1810 { 1811 $tmp_folder_id[1] = mb_convert_encoding( $tmp_folder_id[1], "ISO _8859-1", "UTF7-IMAP" );1811 $tmp_folder_id[1] = mb_convert_encoding( $tmp_folder_id[1], "ISO-8859-1", "UTF7-IMAP" ); 1812 1812 1813 1813 if( $tmp_folder_id[1]=='INBOX'.$this->imap_delimiter.'decifradas') … … 2119 2119 } 2120 2120 2121 $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO _8859-1");2121 $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO-8859-1"); 2122 2122 $folder_name = $params['folder_name']; 2123 2123 // Fix problem with cyrus delimiter changes. … … 2637 2637 $mbox_stream = $this->open_mbox($folder); 2638 2638 $newmailbox = ($params['new_folder']); 2639 $newmailbox = mb_convert_encoding($newmailbox, "UTF7-IMAP","ISO _8859-1");2639 $newmailbox = mb_convert_encoding($newmailbox, "UTF7-IMAP","ISO-8859-1"); 2640 2640 $new_folder_name = $params['new_folder_name']; 2641 2641 $msgs_number = $params['msgs_number']; … … 2763 2763 2764 2764 $folder = $params['folder']; 2765 $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO _8859-1");2765 $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO-8859-1"); 2766 2766 // Fix problem with cyrus delimiter changes. 2767 2767 // Dots in names: enabled/disabled. … … 3494 3494 } 3495 3495 3496 $name_box = mb_convert_encoding(utf8_decode($name_box), "UTF7-IMAP", "ISO _8859-1" );3496 $name_box = mb_convert_encoding(utf8_decode($name_box), "UTF7-IMAP", "ISO-8859-1" ); 3497 3497 $filter = $this->remove_accents($filter); 3498 3498 … … 3510 3510 } 3511 3511 else 3512 $folder_name = mb_convert_encoding(utf8_decode($name_box), "UTF7-IMAP", "ISO _8859-1" );3512 $folder_name = mb_convert_encoding(utf8_decode($name_box), "UTF7-IMAP", "ISO-8859-1" ); 3513 3513 3514 3514 if(!is_resource($mbox_stream)) … … 3533 3533 { 3534 3534 $elem = $this->get_msg_detail($new_search,$name_box,$mbox_stream); 3535 $elem['boxname'] = mb_convert_encoding( $name_box, "ISO _8859-1", "UTF7-IMAP" );3535 $elem['boxname'] = mb_convert_encoding( $name_box, "ISO-8859-1", "UTF7-IMAP" ); 3536 3536 $elem['uid'] = $new_search; 3537 3537 /* compare dates in ordering */ … … 3578 3578 { 3579 3579 $elem = $this->get_msg_detail($new_search,$name_box,$mbox_stream); 3580 $elem['boxname'] = mb_convert_encoding( $name_box, "ISO _8859-1", "UTF7-IMAP" );3580 $elem['boxname'] = mb_convert_encoding( $name_box, "ISO-8859-1", "UTF7-IMAP" ); 3581 3581 $elem['uid'] = $new_search; 3582 3582 /* compare dates in ordering */ … … 3760 3760 foreach ($mailboxes_list as $key => $val) 3761 3761 { 3762 $folder = str_replace($serverString, "", imap_utf7_decode($val->name)); 3763 $folder = str_replace("&-", "&", $folder); 3762 $folder = str_replace($serverString, "", $val->name); 3764 3763 imap_setacl ($mbox_stream, $folder, "$uid", ""); 3765 3764 } … … 4095 4094 $quota_used = str_replace(")","",$size); 4096 4095 $quotaPercent = (($quota_used / 1024) / $data["quota_root"]["quota_limit"])*100; 4097 $folder = mb_convert_encoding($folder, "ISO _8859-1", "UTF7-IMAP");4096 $folder = mb_convert_encoding($folder, "ISO-8859-1", "UTF7-IMAP"); 4098 4097 if(!preg_match('/user\\'.$this->imap_delimiter.$this->username.'\\'.$this->imap_delimiter.'/i',$folder)){ 4099 4098 $folder = $this->functions->getLang("Inbox");
Note: See TracChangeset
for help on using the changeset viewer.