Make sure mimetypes is an array not object in a better way

Aleksander Machniak

2013-01-15 a03c28a22f194c3cbaee46abd8def0d7b8fa7e60

 program/steps/mail/show.inc

@@ -59,10 +59,10 @@
  $OUTPUT->set_env('permaurl', rcmail_url('show', array('_uid' => $MESSAGE->uid, '_mbox' => $mbox_name)));
  $OUTPUT->set_env('delimiter', $RCMAIL->storage->get_hierarchy_delimiter());
  $OUTPUT->set_env('mailbox', $mbox_name);
  $OUTPUT->set_env('compose_extwin', $RCMAIL->config->get('compose_extwin',false));

  // mimetypes supported by the browser (default settings)
  $mimetypes = $RCMAIL->config->get('client_mimetypes', 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,image/bmp,image/tiff,application/x-javascript,application/pdf,application/x-shockwave-flash');
  $mimetypes = is_string($mimetypes) ? explode(',', $mimetypes) : (array)$mimetypes;
  $mimetypes = (array)$RCMAIL->config->get('client_mimetypes');

  // Remove unsupported types, which makes that attachment which cannot be
  // displayed in a browser will be downloaded directly without displaying an overlay page
@@ -79,7 +79,7 @@
    }
  }

  $OUTPUT->set_env('mimetypes', $mimetypes);
  $OUTPUT->set_env('mimetypes', array_values($mimetypes));

  if ($CONFIG['drafts_mbox'])
    $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
@@ -150,10 +150,7 @@

  if (sizeof($MESSAGE->attachments)) {
    foreach ($MESSAGE->attachments as $attach_prop) {
      $filename = $attach_prop->filename;
      if (empty($filename) && $attach_prop->mimetype == 'text/html') {
        $filename = rcube_label('htmlmessage');
      }
      $filename = rcmail_attachment_name($attach_prop, true);

      if ($PRINT_MODE) {
        $size = $RCMAIL->message_part_size($attach_prop);