- Allow to override identity when composing a message (#1486466)

alecpl

2010-03-23 416bff5475de17076a453417b9fa4174d506709a

- Allow to override identity when composing a message (#1486466)

 program/steps/mail/compose.inc

@@ -377,7 +377,7 @@
      if ($compose_mode == RCUBE_COMPOSE_REPLY && is_array($MESSAGE->compose_from))
        $MESSAGE->compose_from[] = $sql_arr['email'];

      if (empty($_POST['_from']))
      if (empty($_POST['_from']) && empty($_SESSION['compose']['param']['from']))
      {
        // set draft's identity
        if ($compose_mode == RCUBE_COMPOSE_DRAFT && strstr($MESSAGE->headers->from, $sql_arr['email']))
@@ -391,6 +391,8 @@
    // overwrite identity selection with post parameter
    if (!empty($_POST['_from']))
      $from_id = get_input_value('_from', RCUBE_INPUT_POST);
    else if (!empty($_SESSION['compose']['param']['from']))
      $from_id = $_SESSION['compose']['param']['from'];

    $out = $select_from->show($from_id);