Changeset c793c6e in github

Timestamp:

Jul 8, 2009 4:04:50 AM (4 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

21c277e

Parents:

08b2d93

Message:

Check abort flag and display error message from plugin if available

File:

• program/steps/mail/attachments.inc (modified) (2 diffs)

program/steps/mail/attachments.inc

@@ -85 +85 @@
     $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;
       
@@ -117 +117 @@
         $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');