Changeset 1264

Timestamp:

08/04/09 10:52:11 (15 years ago)

Author:

fpcorrea

Message:

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

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (2 diffs)
• index.php (modified) (1 diff)

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

@@ -60 +60 @@
                 // This error is returned from Postfix.
                 elseif(strstr($error,'message file too big')) {
-                        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).'));
+                        return str_replace("%1",$_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_attachment_size'],$this->functions->getLang('The size of this message has exceeded  the limit (%1B).'));
                 }
                 elseif(strstr($error,'virus')) {
@@ -1818 +1818 @@
                 {
                         $total_uploaded_size = 0;
-                        $upload_max_filesize = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_attachment_size']; 
+                        $upload_max_filesize = str_replace("M","",$_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_attachment_size']) * 1024 * 1024;
                         foreach ($attachments as $attach)
                         {

trunk/expressoMail1_2/index.php

@@ -78 +78 @@
     $_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";
     $_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";
-$_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'); 
+$_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'); 
         $template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
         $template->set_var("txt_loading",lang("Loading"));