- Handle properly situation when uploaded attachment file is too big

1 files changed, 19 insertions, 15 deletions

diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index 6b32ad6a7..14712c628 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -83,23 +83,28 @@ $uploadid = get_input_value('_uploadid', RCUBE_INPUT_GET);
 
 if (is_array($_FILES['_attachments']['tmp_name'])) {
   foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
-    $attachment = array(
-      'path' => $filepath,
-      'size' => $_FILES['_attachments']['size'][$i],
-      'name' => $_FILES['_attachments']['name'][$i],
-      'mimetype' => rc_mime_content_type($filepath, $_FILES['_attachments']['name'][$i], $_FILES['_attachments']['type'][$i]),
-      'group' => $COMPOSE_ID,
-    );
-
-    $attachment = $RCMAIL->plugins->exec_hook('attachment_upload', $attachment);
+    // Process uploaded attachment if there is no error
+    $err = $_FILES['_attachments']['error'][$i];
+
+    if (!$err) {
+      $attachment = array(
+        'path' => $filepath,
+        'size' => $_FILES['_attachments']['size'][$i],
+        'name' => $_FILES['_attachments']['name'][$i],
+        'mimetype' => rc_mime_content_type($filepath, $_FILES['_attachments']['name'][$i], $_FILES['_attachments']['type'][$i]),
+        'group' => $COMPOSE_ID,
+      );
+
+      $attachment = $RCMAIL->plugins->exec_hook('attachment_upload', $attachment);
+    }
 
-    if ($attachment['status'] && !$attachment['abort']) {
+    if (!$err && $attachment['status'] && !$attachment['abort']) {
       $id = $attachment['id'];
-      
+
       // store new attachment in session
       unset($attachment['status'], $attachment['abort']);
       $_SESSION['compose']['attachments'][$id] = $attachment;
-      
+
       if (($icon = $_SESSION['compose']['deleteicon']) && is_file($icon)) {
         $button = html::img(array(
           'src' => $icon,
@@ -117,7 +122,7 @@ if (is_array($_FILES['_attachments']['tmp_name'])) {
       ), $button);
 
       $content .= Q($attachment['name']);
-      
+
       $OUTPUT->command('add2attachment_list', "rcmfile$id", array(
         'html' => $content,
         'name' => $attachment['name'],
@@ -125,7 +130,6 @@ if (is_array($_FILES['_attachments']['tmp_name'])) {
         'complete' => true), $uploadid);
     }
     else {  // upload failed
-      $err = $_FILES['_attachments']['error'][$i];
       if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
         $msg = rcube_label(array('name' => 'filesizeerror', 'vars' => array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
       }
@@ -135,7 +139,7 @@ if (is_array($_FILES['_attachments']['tmp_name'])) {
       else {
         $msg = rcube_label('fileuploaderror');
       }
-    
+
       $OUTPUT->command('display_message', $msg, 'error');
       $OUTPUT->command('remove_from_attachment_list', $uploadid);
     }