Changeset 3414


Ignore:
Timestamp:
10/26/10 14:18:29 (13 years ago)
Author:
brunocosta
Message:

Ticket #1276 - Limite de tamanho para exibição de partes text/plain ou text/html no Expresso mail

Location:
branches/2.2/expressoMail1_2
Files:
4 edited

Legend:

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

    r3402 r3414  
    934934                                                && $file_type != 'attachment') 
    935935                                { 
     936 
     937                                        
     938                                       if($this->prefs['max_msg_size'] == "1") 
     939                                            $max_size = 1048576; 
     940                                        else 
     941                                            $max_size = 102400; 
     942 
    936943                                        if($file_type == "text/plain" && !$show_only_html && $has_multipart) 
    937944                                        { 
    938945                                                // if TXT file size > 100kb, then it will not expand. 
    939                                                 if(!($file_type == "text/plain" && $msg->fsize[$msg_number][$values] > 102400)) { 
     946                                                if(!($file_type == "text/plain" && $msg->fsize[$msg_number][$values] > $max_size)) { 
    940947                                                         $content .= htmlentities($this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]));  
    941                                  $content = '<pre>' . $content . '</pre>';     
     948                                                        $content = '<pre>' . $content . '</pre>'; 
    942949                                                } 
    943950                                        } 
    944951                                        // if HTML attachment file size > 300kb, then it will not expand. 
    945                                         else if($file_type == "text/html"  && $msg->fsize[$msg_number][$values] < 307200) 
     952                                        else if($file_type == "text/html"  && $msg->fsize[$msg_number][$values] < $max_size*3) 
    946953                                        { 
    947954                                                $content .= $this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]); 
  • branches/2.2/expressoMail1_2/inc/hook_settings.inc.php

    r3400 r3414  
    207207 
    208208create_select_box('What is the height of the lines in the list of messages?','line_height',$default,''); 
     209create_check_box('Increases th maximum size of show messages?','max_msg_size','Increases the maximum size of show emails from 100kb to 1mb'); 
    209210create_check_box('Use dynamic contacts?','use_dynamic_contacts','Store your\'s most used contacts'); 
    210211create_check_box('Use shortcuts?','use_shortcuts','n key (Open new message)<br>ESC key (Close tab)<br>i key (print)<br>e key (forward)<br>r key (reply)<br>DELETE key (delete the current message)<br>Ctrl + up (go to previous message)<br>Ctrl + down (go to next message)<br>Shift + up or down (select multiple messages)<br>F9  key (search at catalog)<br>'); 
  • branches/2.2/expressoMail1_2/index.php

    r3407 r3414  
    8787 
    8888        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_attachment_size'] = $current_config['expressoMail_Max_attachment_size'] ? $current_config['expressoMail_Max_attachment_size']."M" : ini_get('upload_max_filesize'); 
    89         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['imap_max_folders'] = $current_config['expressoMail_imap_max_folders'];  
     89        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_msg_size'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_msg_size'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_msg_size'] : "0"; 
     90        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['imap_max_folders'] = $current_config['expressoMail_imap_max_folders']; 
    9091        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'] : "50"; 
    9192        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['extended_info'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['extended_info']?$_SESSION['phpgw_info']['user']['preferences']['expressoMail']['extended_info'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['extended_info']:'0'; 
  • branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang

    r3407 r3414  
    621621Do you want to use SpellChecker in email editor?        expressoMail1_2 pt-br   Quer usar o corretor ortográfico no editor de emails? 
    622622It allow you to check the spelling of your emails       expressoMail1_2 pt-br   Possiblita a correção ortográfica de emails. 
     623Increases th maximum size of show messages?     expressoMail1_2 pt-br   Você quer que se aumente o limite de tamanho de emails que são mostrados? 
     624Increases the maximum size of show emails from 100kb to 1mb'    expressoMail1_2 pt-br   Essa opção aumenta o tamanho máximo dos emails mostrados de 100KB para 1MB. 
Note: See TracChangeset for help on using the changeset viewer.