- fix attachment mimetype setting after upload - move style of delete butto...

alecpl

2009-04-27 1fb5874f276e9ce7731e8f166b19a371ce33b894

- fix attachment mimetype setting after upload
- move style of delete button in attachment-list to mail.css file

 program/steps/mail/attachments.inc

@@ -79,10 +79,11 @@
    $attachment = array(
      'path' => $filepath,
      'name' => $_FILES['_attachments']['name'][$i],
      'mimetype' => rc_mime_content_type($tmpfname, $_FILES['_attachments']['type'][$i])
      'mimetype' => rc_mime_content_type($filepath, $_FILES['_attachments']['type'][$i])
    );

    $attachment = $RCMAIL->plugins->exec_hook('upload_attachment', $attachment);

    if ($attachment['status']) {
      $id = $attachment['id'];
      
@@ -93,8 +94,7 @@
      if (is_file($icon = $CONFIG['skin_path'] . '/images/icons/remove-attachment.png')) {
        $button = html::img(array(
          'src' => $icon,
          'alt' => rcube_label('delete'),
          'style' => "padding-right:2px;vertical-align:middle",
          'alt' => rcube_label('delete')
        ));
      }
      else {

 program/steps/mail/compose.inc

@@ -715,8 +715,8 @@
    if ($attrib['deleteicon'])
      $button = html::img(array(
        'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
        'alt' => rcube_label('delete'),
        'style' => "padding-right:2px;vertical-align:middle"));
        'alt' => rcube_label('delete')
    ));
    else
      $button = Q(rcube_label('delete'));


 skins/default/mail.css

@@ -1016,6 +1016,12 @@
  overflow: hidden;
}

#compose-attachments ul li img
{
  padding-right: 2px;
  vertical-align: middle;
}

#attachment-title
{
  background: url(images/icons/attachment.png) top left no-repeat;