Changeset 2866

Timestamp:

05/26/10 17:39:06 (14 years ago)

Author:

fpcorrea

Message:

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

Location:

trunk

Files:

• admin/inc/class.uiconfig.inc.php (modified) (1 diff)
• admin/setup/phpgw_en.lang (modified) (previous)
• admin/setup/phpgw_pt-br.lang (modified) (previous)
• expressoMail1_2/js/jscode/main.js (modified) (1 diff)
• expressoMail1_2/templates/default/config.tpl (modified) (2 diffs)

trunk/admin/inc/class.uiconfig.inc.php

@@ -208 +208 @@
                         $t->set_var('row_on',    $GLOBALS['phpgw_info']['theme']['row_on']);
                         $t->set_var('row_off',   $GLOBALS['phpgw_info']['theme']['row_off']);
+                        $t->set_var('php_upload_limit',str_replace('M','',ini_get('upload_max_filesize')));
                         $t->pparse('out','header');
 

trunk/expressoMail1_2/js/jscode/main.js

@@ -1545 +1545 @@
         else{
                 if(data == 'Post-Content-Length')
-                        write_msg(get_lang('The size of this message has exceeded  the limit (%1B).',Element('upload_max_filesize').value));
+                        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));
                 else if(data)
                         write_msg(data);

trunk/expressoMail1_2/templates/default/config.tpl

@@ -1 +1 @@
 <!-- BEGIN header -->
-<form method="POST" action="{action_url}" onsubmit="return ExpressoLivre.form( this );">
+<script>
+function valida(pForm)
+{
+        if (document.getElementsByName('newsettings[expressoMail_Max_attachment_size]').item(0).value > pForm.php_upload_limit.value)
+        {
+                alert(pForm.valida_alert.value);
+                return false;
+        }
+        else
+                return ExpressoLivre.form(pForm);
+}
+</script>
+<form method="POST" action="{action_url}" onsubmit="return valida( this );">
+<input type="hidden" name="php_upload_limit" value="{php_upload_limit}" />
 <table border="0" align="center">
    <tr bgcolor="{th_bg}">
@@ -66 +79 @@
     <td>{lang_Max_attachment_size}</td>                  
     <td>                 
-    <input size="1" name="newsettings[expressoMail_Max_attachment_size]" value="{value_expressoMail_Max_attachment_size}">&nbsp;Mb
+    <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>
+    <input type="hidden" name="valida_alert" value="{lang_Value_exceeds_the_PHP_upload_limit_for_this_server}" />
     </td>
     </tr>