Roundcubemail devel
blame | history | patch | commit | commitdiff | ignore whitespace
alecpl
2011-09-07 80152b333ca5d856dcf09f5ca10a9ffd80ba117f 
 program/steps/mail/show.inc


@@ -52,6 +52,10 @@


  $OUTPUT->set_env('delimiter', $IMAP->get_hierarchy_delimiter());


  $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);




  if ($CONFIG['trash_mbox'])


    $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);


  if ($CONFIG['flag_for_deletion'])


@@ -64,7 +68,7 @@


    $OUTPUT->set_env('display_next', true);


  if ($MESSAGE->headers->others['list-post'])


    $OUTPUT->set_env('list_post', true);


  if ($CONFIG['forward_attachment'])                                                                                                      


  if ($CONFIG['forward_attachment'])


    $OUTPUT->set_env('forward_attachment', true);




  if (!$OUTPUT->ajax_call)


@@ -73,7 +77,7 @@




  // check for unset disposition notification


  if ($MESSAGE->headers->mdn_to &&


      !$MESSAGE->headers->mdn_sent && !$MESSAGE->headers->seen &&


      !$MESSAGE->headers->mdnsent && !$MESSAGE->headers->seen &&


      ($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*')) &&


      $mbox_name != $CONFIG['drafts_mbox'] &&


      $mbox_name != $CONFIG['sent_mbox'])