Changeset 1248


Ignore:
Timestamp:
08/03/09 10:35:38 (15 years ago)
Author:
amuller
Message:

Ticket #573 - Importação de mensagens é limitado pelo tamanho máximo de anexos

Location:
trunk
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/expressoMail1_2/inc/class.imap_functions.inc.php

    r1247 r1248  
    6060                // This error is returned from Postfix. 
    6161                elseif(strstr($error,'message file too big')) { 
    62                         return str_replace("%1", ini_get('upload_max_filesize'),$this->functions->getLang('The size of this message has exceeded  the limit (%1B).'));                   
     62                        return str_replace("%1",$_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_attachment_size']."M",$this->functions->getLang('The size of this message has exceeded  the limit (%1B).')); 
    6363                } 
    6464                elseif(strstr($error,'virus')) { 
    … …  
    18181818                { 
    18191819                        $total_uploaded_size = 0; 
    1820                         $upload_max_filesize = str_replace("M","",ini_get('upload_max_filesize')) * 1024 * 1024; 
     1820                        $upload_max_filesize = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_attachment_size'];  
    18211821                        foreach ($attachments as $attach) 
    18221822                        { 

  • trunk/expressoMail1_2/index.php

    r1247 r1248  
    7878    $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['num_max_certs_to_cipher'] = $GLOBALS['phpgw_info']['server']['num_max_certs_to_cipher'] ?  $GLOBALS['phpgw_info']['server']['num_max_certs_to_cipher'] : "10"; 
    7979    $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_signature_cripto'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature_cripto'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature_cripto'] : "0"; 
    80  
     80$_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_attachment_size'] = $current_config['expressoMail_Max_attachment_size'] ? $current_config['expressoMail_Max_attachment_size'] : ini_get('upload_max_filesize');  
    8181        $template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 
    8282        $template->set_var("txt_loading",lang("Loading")); 

  • trunk/expressoMail1_2/templates/default/config.tpl

    r1247 r1248  
    9999    </td> 
    100100    </tr> 
     101    <tr bgcolor="{row_off}">              
     102    <td>{lang_Max_attachment_size}</td>                   
     103    <td>                  
     104    <input size="1" name="newsettings[expressoMail_Max_attachment_size]" value="{value_expressoMail_Max_attachment_size}">                
     105    </td>                 
     106    </tr>  
    101107<!-- END body --> 
    102108<!-- BEGIN footer --> 
Note: See TracChangeset for help on using the changeset viewer.