summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2009-07-08 08:04:50 +0000
committerthomascube <thomas@roundcube.net>2009-07-08 08:04:50 +0000
commitc793c6e811845a3332e1d8961a050e758498dc00 (patch)
treeda5e77f47d57dc7c7e4cbf3a1e08e5e5345d0347 /program
parent08b2d93f5b056187e90569e22466516b6a6b562b (diff)
Check abort flag and display error message from plugin if available
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/attachments.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index 52c09b460..601570345 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -84,11 +84,11 @@ if (is_array($_FILES['_attachments']['tmp_name'])) {
$attachment = $RCMAIL->plugins->exec_hook('upload_attachment', $attachment);
- if ($attachment['status']) {
+ if ($attachment['status'] && !$attachment['abort']) {
$id = $attachment['id'];
// store new attachment in session
- unset($attachment['status']);
+ unset($attachment['status'], $attachment['abort']);
$_SESSION['compose']['attachments'][$id] = $attachment;
if (($icon = $_SESSION['compose']['deleteicon']) && is_file($icon)) {
@@ -116,6 +116,9 @@ if (is_array($_FILES['_attachments']['tmp_name'])) {
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'))))));
}
+ else if ($attachment['error']) {
+ $msg = $attachment['error'];
+ }
else {
$msg = rcube_label('fileuploaderror');
}