Changeset 2866


Ignore:
Timestamp:
05/26/10 17:39:06 (12 years ago)
Author:
fpcorrea
Message:

Ticket #1088 - Limite de anexos agora trata casos descritos no ticket

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/inc/class.uiconfig.inc.php

    r2802 r2866  
    208208                        $t->set_var('row_on',    $GLOBALS['phpgw_info']['theme']['row_on']); 
    209209                        $t->set_var('row_off',   $GLOBALS['phpgw_info']['theme']['row_off']); 
     210                        $t->set_var('php_upload_limit',str_replace('M','',ini_get('upload_max_filesize'))); 
    210211                        $t->pparse('out','header'); 
    211212 
  • trunk/expressoMail1_2/js/jscode/main.js

    r2801 r2866  
    15451545        else{ 
    15461546                if(data == 'Post-Content-Length') 
    1547                         write_msg(get_lang('The size of this message has exceeded  the limit (%1B).',Element('upload_max_filesize').value)); 
     1547                        write_msg(get_lang('The size of this message has exceeded  the limit (%1B).',preferences.max_attachment_size ? preferences.max_attachment_size : Element('upload_max_filesize').value)); 
    15481548                else if(data) 
    15491549                        write_msg(data); 
  • trunk/expressoMail1_2/templates/default/config.tpl

    r2802 r2866  
    11<!-- BEGIN header --> 
    2 <form method="POST" action="{action_url}" onsubmit="return ExpressoLivre.form( this );"> 
     2<script> 
     3function valida(pForm) 
     4{ 
     5        if (document.getElementsByName('newsettings[expressoMail_Max_attachment_size]').item(0).value > pForm.php_upload_limit.value) 
     6        { 
     7                alert(pForm.valida_alert.value); 
     8                return false; 
     9        } 
     10        else 
     11                return ExpressoLivre.form(pForm); 
     12} 
     13</script> 
     14<form method="POST" action="{action_url}" onsubmit="return valida( this );"> 
     15<input type="hidden" name="php_upload_limit" value="{php_upload_limit}" /> 
    316<table border="0" align="center"> 
    417   <tr bgcolor="{th_bg}"> 
     
    6679    <td>{lang_Max_attachment_size}</td>                   
    6780    <td>                  
    68     <input size="1" name="newsettings[expressoMail_Max_attachment_size]" value="{value_expressoMail_Max_attachment_size}">&nbsp;Mb 
     81    <input size="1" name="newsettings[expressoMail_Max_attachment_size]" value="{value_expressoMail_Max_attachment_size}">&nbsp;Mb<span style='position:relative; left:20px;'>Max: {php_upload_limit}Mb.</span> 
     82    <input type="hidden" name="valida_alert" value="{lang_Value_exceeds_the_PHP_upload_limit_for_this_server}" /> 
    6983    </td> 
    7084    </tr> 
Note: See TracChangeset for help on using the changeset viewer.