Changeset 6621 for branches


Ignore:
Timestamp:
06/25/12 16:21:19 (7 years ago)
Author:
eduardow
Message:

Ticket #2893 - Problemas ao encaminhar mensagem no expresso mail.

Location:
branches/2.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php

    r6540 r6621  
    166166                $return = $this->get_range_msgs2($params); 
    167167 
    168                 $return['folder'] = mb_convert_encoding( $return['folder'], 'ISO_8859-1', 'UTF-8' ); 
     168                $return['folder'] = mb_convert_encoding( $return['folder'], 'ISO-8859-1', 'UTF-8' ); 
    169169 
    170170                return $return; 
     
    192192 
    193193            if(!$search_box_type || $search_box_type == 'UNSEEN' || $search_box_type == 'SEEN') { 
    194                     $msgs_info = imap_status($this->mbox,"{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".mb_convert_encoding( $folder, 'UTF7-IMAP', 'UTF-8, ISO_8859-1' ) ,SA_ALL); 
     194                    $msgs_info = imap_status($this->mbox,"{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".mb_convert_encoding( $folder, 'UTF7-IMAP', 'UTF-8, ISO-8859-1' ) ,SA_ALL); 
    195195 
    196196                    $return['tot_unseen'] = ($search_box_type == 'SEEN') ? 0 : $msgs_info->unseen; 
     
    27712771            } 
    27722772 
    2773             $folder = mb_convert_encoding($folder, 'UTF7-IMAP', 'ISO_8859-1'); 
     2773            $folder = mb_convert_encoding($folder, 'UTF7-IMAP', 'ISO-8859-1'); 
    27742774            $folder = preg_replace('/INBOX[\/.]/i', 'INBOX' . $this->imap_delimiter, $folder); 
    27752775            $folder_name = $params['folder_name']; 
     
    29422942                                {     
    29432943                                    $body = str_ireplace('<img src="./inc/get_archive.php?msgFolder='.$value['folder'].'&msgNumber='.$value['uid'].'&indexPart='.$value['part'].'" />' , '<img src="'.$att['name'].'" />', $body); 
    2944                                     $mailService->addStringImage($att['source'], $att['type'],mb_convert_encoding($att['name'], 'ISO_8859-1' , 'UTF-8,ISO_8859-1') );  
     2944                                    $mailService->addStringImage($att['source'], $att['type'],mb_convert_encoding($att['name'], 'ISO-8859-1' , 'UTF-8,ISO-8859-1') );  
    29452945                                } 
    29462946                                else 
     
    30373037            if ($isHTML) 
    30383038            {  
    3039  
    3040                 require_once(dirname(__FILE__).'/../../library/CssToInlineStyles/css_to_inline_styles.php');  
    3041                 $defaultStyle = '.expressoDefaultFont{';  
     3039                $defaultStyle = '';  
    30423040                  
    30433041                if(isset($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['font_family_editor']) && $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['font_family_editor'])  
     
    30463044                if(isset($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['font_size_editor']) && $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['font_size_editor'])  
    30473045                $defaultStyle .= ' font-size:'.$_SESSION['phpgw_info']['user']['preferences']['expressoMail']['font_size_editor'].';';  
    3048                          
    3049                 $defaultStyle .= '}';  
    3050          
    3051                 $cssToInlineStyles = new CSSToInlineStyles('<span class="expressoDefaultFont">'.$body.'</span>');  
    3052                 $cssToInlineStyles->setUseInlineStylesBlock(true);  
    3053                 $cssToInlineStyles->setCSS($defaultStyle);  
    3054                 $cssToInlineStyles->setCleanup(TRUE);  
    3055                 $body = $cssToInlineStyles->convert(); //Converte as tag style em inline styles  
    3056                 unset($cssToInlineStyles);  
    3057                   
     3046                        
     3047                $body = '<span class="'.$defaultStyle.'">'.$body.'</span>';  
    30583048                $mailService->setBodyHtml($body); 
    30593049             } 
     
    50275017                    $quota_used = str_replace(")","",$size);  
    50285018                    $quotaPercent = (($quota_used / 1024) / $data["quota_root"]["quota_limit"])*100;  
    5029                     $folder = mb_convert_encoding($folder, "ISO_8859-1", "UTF7-IMAP");  
     5019                    $folder = mb_convert_encoding($folder, "ISO-8859-1", "UTF7-IMAP");  
    50305020                    if(!preg_match('/user\\'.$this->imap_delimiter.$this->username.'\\'.$this->imap_delimiter.'/i',$folder)){  
    50315021                            $folder = $this->functions->getLang("Inbox");  
  • branches/2.4/prototype/services/ImapServiceAdapter.php

    r6540 r6621  
    625625                                                if($att['disposition'] == 'embedded') 
    626626                                                { 
    627                                                         $body = str_replace('"../prototype/getArchive.php?mailAttachment='.$att['id'].'"', $att['name'], $body); 
     627                                                        $body = str_replace('"../prototype/getArchive.php?mailAttachment='.$att['id'].'"', '"'.mb_convert_encoding($att['name'], 'ISO-8859-1' , 'UTF-8,ISO-8859-1').'"', $body); 
    628628                                                        $mailService->addStringImage(base64_decode($att['source']), $att['type'], mb_convert_encoding($att['name'], 'ISO-8859-1' , 'UTF-8,ISO-8859-1'));  
    629629                                                } 
Note: See TracChangeset for help on using the changeset viewer.