Display full attachment name using title attribute when name is too long to...

Aleksander Machniak

2013-09-15 7f1218caeacb5c3085047e61b9e3cf8e82198045

 program/steps/mail/attachments.inc

@@ -17,9 +17,6 @@
 +-----------------------------------------------------------------------+
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+

 $Id$

*/

// Upload progress update
@@ -30,8 +27,10 @@
$COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GPC);
$COMPOSE    = null;

if ($COMPOSE_ID && $_SESSION['compose_data_'.$COMPOSE_ID])
  $COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];
if ($COMPOSE_ID && $_SESSION['compose_data_' . $COMPOSE_ID]) {
  $SESSION_KEY = 'compose_data_' . $COMPOSE_ID;
  $COMPOSE =& $_SESSION[$SESSION_KEY];
}

if (!$COMPOSE) {
  die("Invalid session var!");
@@ -48,7 +47,7 @@
    $attachment = $RCMAIL->plugins->exec_hook('attachment_delete', $attachment);
  if ($attachment['status']) {
    if (is_array($COMPOSE['attachments'][$id])) {
      unset($COMPOSE['attachments'][$id]);
      $RCMAIL->session->remove($SESSION_KEY.'.attachments.'.$id);
      $OUTPUT->command('remove_from_attachment_list', "rcmfile$id");
    }
  }
@@ -80,11 +79,7 @@
  exit;
}

// attachment upload action

if (!is_array($COMPOSE['attachments'])) {
  $COMPOSE['attachments'] = array();
}
/*****  attachment upload action  *****/

// clear all stored output properties (like scripts and env vars)
$OUTPUT->reset();
@@ -92,6 +87,8 @@
$uploadid = get_input_value('_uploadid', RCUBE_INPUT_GET);

if (is_array($_FILES['_attachments']['tmp_name'])) {
  $multiple = count($_FILES['_attachments']['tmp_name']) > 1;

  foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
    // Process uploaded attachment if there is no error
    $err = $_FILES['_attachments']['error'][$i];
@@ -113,7 +110,7 @@

      // store new attachment in session
      unset($attachment['status'], $attachment['abort']);
      $COMPOSE['attachments'][$id] = $attachment;
      $RCMAIL->session->append($SESSION_KEY.'.attachments', $id, $attachment);

      if (($icon = $COMPOSE['deleteicon']) && is_file($icon)) {
        $button = html::img(array(
@@ -121,8 +118,11 @@
          'alt' => rcube_label('delete')
        ));
      }
      else {
      else if ($COMPOSE['textbuttons']) {
        $button = Q(rcube_label('delete'));
      }
      else {
        $button = '';
      }

      $content = html::a(array(
@@ -152,8 +152,10 @@
        $msg = rcube_label('fileuploaderror');
      }

      $OUTPUT->command('display_message', $msg, 'error');
      $OUTPUT->command('remove_from_attachment_list', $uploadid);
      if ($attachment['error'] || $err != UPLOAD_ERR_NO_FILE) {
        $OUTPUT->command('display_message', $msg, 'error');
        $OUTPUT->command('remove_from_attachment_list', $uploadid);
      }
    }
  }
}