- Handle properly situation when uploaded attachment file is too big

release-0.6
alecpl 14 years ago
parent 32b11d325e
commit 569701d700

@ -83,6 +83,10 @@ $uploadid = get_input_value('_uploadid', RCUBE_INPUT_GET);
if (is_array($_FILES['_attachments']['tmp_name'])) {
foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
// Process uploaded attachment if there is no error
$err = $_FILES['_attachments']['error'][$i];
if (!$err) {
$attachment = array(
'path' => $filepath,
'size' => $_FILES['_attachments']['size'][$i],
@ -92,8 +96,9 @@ if (is_array($_FILES['_attachments']['tmp_name'])) {
);
$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
@ -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'))))));
}

Loading…
Cancel
Save