- Fix IDNA support when IDN/INTL modules are in use (#1487742)

alecpl

2011-02-03 e8d5bdc84ecfdf6fe5008655215a258bbdf0c521

 program/steps/mail/compose.inc

@@ -321,7 +321,7 @@
        if (empty($addr_part['mailto']))
          continue;

        $mailto = idn_to_utf8($addr_part['mailto']);
        $mailto = rcube_idn_to_utf8($addr_part['mailto']);

        if (!in_array($mailto, $sa_recipients)
            && (!$MESSAGE->compose_from
@@ -360,7 +360,7 @@
      if (empty($addr_part['mailto']))
        continue;

      $mailto = idn_to_utf8($addr_part['mailto']);
      $mailto = rcube_idn_to_utf8($addr_part['mailto']);

      if ($addr_part['name'] && $addr_part['mailto'] != $addr_part['name'])
        $string = format_email_recipient($mailto, $addr_part['name']);
@@ -437,7 +437,7 @@
    // create SELECT element
    foreach ($user_identities as $sql_arr)
    {
      $email = mb_strtolower(idn_to_utf8($sql_arr['email']));
      $email = mb_strtolower(rcube_idn_to_utf8($sql_arr['email']));
      $identity_id = $sql_arr['identity_id'];
      $select_from->add(format_email_recipient($email, $sql_arr['name']), $identity_id);

@@ -734,7 +734,7 @@
  // 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'] : idn_to_utf8($from['mailto']));
    $MESSAGE->headers->date, $from['name'] ? $from['name'] : rcube_idn_to_utf8($from['mailto']));

  if (!$bodyIsHtml) {
    $body = preg_replace('/\r?\n/', "\n", $body);