Fix address matching in Return-Path header on identity selection (#1489374)

Aleksander Machniak

2013-10-15 c20fa4a1ad57a6fa013c7c9ddba72c6c3aafe345

 program/steps/mail/compose.inc

@@ -54,30 +54,12 @@
  $COMPOSE_ID = uniqid(mt_rand());
  $_SESSION['compose_data_'.$COMPOSE_ID] = array(
    'id'      => $COMPOSE_ID,
    'param'   => request2param(RCUBE_INPUT_GET),
    'param'   => rcube_utils::request2param(RCUBE_INPUT_GET, 'task|action', true),
    'mailbox' => $RCMAIL->storage->get_folder(),
  );
  $COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];

  // process values like "mailto:foo@bar.com?subject=new+message&cc=another"
  if ($COMPOSE['param']['to']) {
    // #1486037: remove "mailto:" prefix
    $COMPOSE['param']['to'] = preg_replace('/^mailto:/i', '', $COMPOSE['param']['to']);
    $mailto = explode('?', $COMPOSE['param']['to']);
    if (count($mailto) > 1) {
      $COMPOSE['param']['to'] = $mailto[0];
      parse_str($mailto[1], $query);
      foreach ($query as $f => $val)
        $COMPOSE['param'][$f] = $val;
    }
  }

  // select folder where to save the sent message
  $COMPOSE['param']['sent_mbox'] = $RCMAIL->config->get('sent_mbox');

  // pipe compose parameters thru plugins
  $plugin = $RCMAIL->plugins->exec_hook('message_compose', $COMPOSE);
  $COMPOSE['param'] = array_merge($COMPOSE['param'], $plugin['param']);
  rcmail_process_compose_params($COMPOSE);

  // add attachments listed by message_compose hook
  if (is_array($plugin['attachments'])) {
@@ -146,6 +128,11 @@
$font = rcube_fontdefs($RCMAIL->config->get('default_font'));
if ($font && !is_array($font)) {
  $OUTPUT->set_env('default_font', $font);
}

// default font size for HTML editor
if ($font_size = $RCMAIL->config->get('default_font_size')) {
  $OUTPUT->set_env('default_font_size', $font_size);
}

// get reference message and set compose mode
@@ -255,6 +242,14 @@
}
else {
  $MESSAGE = new stdClass();

  // apply mailto: URL parameters
  if (!empty($COMPOSE['param']['in-reply-to'])) {
    $COMPOSE['reply_msgid'] = '<' . $COMPOSE['param']['in-reply-to'] . '>';
  }
  if (!empty($COMPOSE['param']['references'])) {
    $COMPOSE['references'] = $COMPOSE['param']['references'];
  }
}

$MESSAGE->compose = array();
@@ -408,6 +403,53 @@


/****** compose mode functions ********/

// process compose request parameters
function rcmail_process_compose_params(&$COMPOSE)
{
  if ($COMPOSE['param']['to']) {
    $mailto = explode('?', $COMPOSE['param']['to'], 2);

    // #1486037: remove "mailto:" prefix
    $COMPOSE['param']['to'] = preg_replace('/^mailto:/i', '', $mailto[0]);

    // Supported case-insensitive tokens in mailto URL
    $url_tokens = array('to', 'cc', 'bcc', 'reply-to', 'in-reply-to', 'references', 'subject', 'body');

    if (!empty($mailto[1])) {
      parse_str($mailto[1], $query);
      foreach ($query as $f => $val) {
        if (($key = array_search(strtolower($f), $url_tokens)) !== false) {
          $f = $url_tokens[$key];
        }

        // merge mailto: addresses with addresses from 'to' parameter
        if ($f == 'to' && !empty($COMPOSE['param']['to'])) {
          $to_addresses  = rcube_mime::decode_address_list($COMPOSE['param']['to'], null, true, null, true);
          $add_addresses = rcube_mime::decode_address_list($val, null, true);
          foreach ($add_addresses as $addr) {
            if (!in_array($addr['mailto'], $to_addresses)) {
              $to_addresses[] = $addr['mailto'];
              $COMPOSE['param']['to'] = (!empty($to_addresses) ? ', ' : '') . $addr['string'];
            }
          }
        }
        else {
          $COMPOSE['param'][$f] = $val;
        }
      }
    }
  }

  $RCMAIL = rcmail::get_instance();

  // select folder where to save the sent message
  $COMPOSE['param']['sent_mbox'] = $RCMAIL->config->get('sent_mbox');

  // pipe compose parameters thru plugins
  $plugin = $RCMAIL->plugins->exec_hook('message_compose', $COMPOSE);
  $COMPOSE['param'] = array_merge($COMPOSE['param'], $plugin['param']);
}

function rcmail_compose_headers($attrib)
{
@@ -1370,8 +1412,9 @@
  if (!$attrib['id'])
    $attrib['id'] = 'rcmAttachmentList';

  $out = "\n";
  $out    = "\n";
  $jslist = array();
  $button = '';

  if (is_array($COMPOSE['attachments'])) {
    if ($attrib['deleteicon']) {
@@ -1380,27 +1423,38 @@
        'alt' => rcube_label('delete')
      ));
    }
    else
    else if (rcube_utils::get_boolean($attrib['textbuttons'])) {
      $button = Q(rcube_label('delete'));
    }

    foreach ($COMPOSE['attachments'] as $id => $a_prop) {
      if (empty($a_prop))
        continue;

      $out .= html::tag('li', array('id' => 'rcmfile'.$id, 'class' => rcmail_filetype2classname($a_prop['mimetype'], $a_prop['name'])),
      $out .= html::tag('li',
        array(
          'id'          => 'rcmfile'.$id,
          'class'       => rcmail_filetype2classname($a_prop['mimetype'], $a_prop['name']),
          'onmouseover' => "rcube_webmail.long_subject_title_ex(this, 0)",
        ),
        html::a(array(
            'href' => "#delete",
            'title' => rcube_label('delete'),
            'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", JS_OBJECT_NAME, $id),
            'class' => 'delete'),
          $button) . Q($a_prop['name']));
            'class' => 'delete'
          ),
          $button
        ) . Q($a_prop['name'])
      );

        $jslist['rcmfile'.$id] = array('name' => $a_prop['name'], 'complete' => true, 'mimetype' => $a_prop['mimetype']);
      $jslist['rcmfile'.$id] = array('name' => $a_prop['name'], 'complete' => true, 'mimetype' => $a_prop['mimetype']);
    }
  }

  if ($attrib['deleteicon'])
    $COMPOSE['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon'];
  else if (rcube_utils::get_boolean($attrib['textbuttons']))
    $COMPOSE['textbuttons'] = true;
  if ($attrib['cancelicon'])
    $OUTPUT->set_env('cancelicon', $CONFIG['skin_path'] . $attrib['cancelicon']);
  if ($attrib['loadingicon'])