Use browser capabilities to decide if PDF/TIFF attachments should be displa...

Aleksander Machniak

2012-05-28 7c1231a94b2a3dddd74b17c7c66bc9d41bb55f47

 program/steps/mail/show.inc

@@ -61,8 +61,20 @@
  $OUTPUT->set_env('mailbox', $mbox_name);

  // 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,application/x-javascript,application/pdf,application/x-shockwave-flash');
  $OUTPUT->set_env('mimetypes', is_string($mimetypes) ? explode(',', $mimetypes) : (array)$mimetypes);
  $mimetypes = $RCMAIL->config->get('client_mimetypes', 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,image/tiff,application/x-javascript,application/pdf,application/x-shockwave-flash');
  $mimetypes = is_string($mimetypes) ? explode(',', $mimetypes) : (array)$mimetypes;

  // Remove unsupported types, which makes that attachment which cannot be
  // displayed in a browser will be downloaded directly without displaying an overlay page
  if (empty($_SESSION['browser_caps']['pdf']) && ($key = array_search('application/pdf', $mimetypes)) !== false) {
    unset($mimetypes[$key]);
  }
  // @TODO: we could convert TIFF to JPEG and display it
  if (empty($_SESSION['browser_caps']['tif']) && ($key = array_search('image/tiff', $mimetypes)) !== false) {
    unset($mimetypes[$key]);
  }

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

  if ($CONFIG['drafts_mbox'])
    $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);