Fix folders drop-down list: descend into root folder (e.g. INBOX) even if p...

thomascube

2011-08-18 fbe54043cf598b19a753dc2b21a7ed558d23fd15

 program/steps/mail/compose.inc

@@ -274,17 +274,11 @@
    $ident = format_email_recipient($email, $sql_arr['name']);

    // select identity
    if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
    if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT, RCUBE_COMPOSE_REPLY))) {
      if ($MESSAGE->headers->from == $ident) {
        $from_idx = $idx;
        break;
      }
    }
    // reply to self, force To header value
    else if ($compose_mode == RCUBE_COMPOSE_REPLY && $MESSAGE->headers->from == $ident) {
      $from_idx = $idx;
      $MESSAGE->compose['to'] = $MESSAGE->headers->to;
      break;
    }
    // set identity if it's one of the reply-message recipients
    else if (in_array($email, $a_recipients) && ($from_idx === null || $sql_arr['standard'])) {
@@ -335,13 +329,13 @@
      $mailfollowup = $MESSAGE->headers->others['mail-followup-to'];
      $mailreplyto  = $MESSAGE->headers->others['mail-reply-to'];

      if ($MESSAGE->compose['to'])
        $fvalue = $MESSAGE->compose['to'];
      else if ($MESSAGE->reply_all == 'list' && $mailfollowup)
      if ($MESSAGE->reply_all == 'list' && $mailfollowup)
        $fvalue = $mailfollowup;
      else if ($MESSAGE->reply_all == 'list'
        && preg_match('/<mailto:([^>]+)>/i', $MESSAGE->headers->others['list-post'], $m))
        $fvalue = $m[1];
      else if ($MESSAGE->reply_all && $mailfollowup)
        $fvalue = $mailfollowup;
      else if ($mailreplyto)
        $fvalue = $mailreplyto;
      else if (!empty($MESSAGE->headers->replyto))
@@ -385,7 +379,7 @@
      $mailto = mb_strtolower(rcube_idn_to_utf8($addr_part['mailto']));

      if (!in_array($mailto, $a_recipients)
        && (empty($MESSAGE->compose['from_email']) || $mailto != $MESSAGE->compose['from_email'])
        && ($header == 'to' || empty($MESSAGE->compose['from_email']) || $mailto != $MESSAGE->compose['from_email'])
      ) {
        if ($addr_part['name'] && $addr_part['mailto'] != $addr_part['name'])
          $string = format_email_recipient($mailto, $addr_part['name']);
@@ -396,7 +390,7 @@
        $a_recipients[] = $addr_part['mailto'];
      }
    }
    

    $fvalue = implode(', ', $fvalue);
  }

@@ -764,8 +758,13 @@

  // build reply prefix
  $from = array_pop($RCMAIL->imap->decode_address_list($MESSAGE->get_header('from'), 1, false));
  $prefix = sprintf("On %s, %s wrote:",
    $MESSAGE->headers->date, $from['name'] ? $from['name'] : rcube_idn_to_utf8($from['mailto']));
  $prefix = rcube_label(array(
    'name' => 'mailreplyintro',
    'vars' => array(
      'date' => format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long')),
      'sender' => $from['name'] ? $from['name'] : rcube_idn_to_utf8($from['mailto']),
    )
  ));

  if (!$bodyIsHtml) {
    $body = preg_replace('/\r?\n/', "\n", $body);
@@ -1207,20 +1206,11 @@
  if (!$attrib['id'])
    $attrib['id'] = 'rcmUploadbox';

  // Enable upload progress bar
  rcube_upload_progress_init();
  // Get filesize, enable upload progress bar
  $max_filesize = rcube_upload_init();

  // find max filesize value
  $max_filesize = parse_bytes(ini_get('upload_max_filesize'));
  $max_postsize = parse_bytes(ini_get('post_max_size'));
  if ($max_postsize && $max_postsize < $max_filesize)
    $max_filesize = $max_postsize;

  $OUTPUT->set_env('max_filesize', $max_filesize);
  $max_filesize = show_bytes($max_filesize);
  
  $button = new html_inputfield(array('type' => 'button'));
  

  $out = html::div($attrib,
    $OUTPUT->form_tag(array('name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'),
      html::div(null, rcmail_compose_attachment_field(array('size' => $attrib['attachmentfieldsize']))) .
@@ -1231,7 +1221,7 @@
      )
    )
  );
  

  $OUTPUT->add_gui_object('uploadbox', $attrib['id']);
  return $out;
}