|
|
@ -298,12 +298,12 @@ $headers['From'] = rcube_charset_convert($from_string, RCMAIL_CHARSET, $message_
|
|
|
|
$headers['To'] = $mailto;
|
|
|
|
$headers['To'] = $mailto;
|
|
|
|
|
|
|
|
|
|
|
|
// additional recipients
|
|
|
|
// additional recipients
|
|
|
|
if (!empty($mailcc))
|
|
|
|
if (!empty($mailcc)) {
|
|
|
|
$headers['Cc'] = $mailcc;
|
|
|
|
$headers['Cc'] = $mailcc;
|
|
|
|
|
|
|
|
}
|
|
|
|
if (!empty($mailbcc))
|
|
|
|
if (!empty($mailbcc)) {
|
|
|
|
$headers['Bcc'] = $mailbcc;
|
|
|
|
$headers['Bcc'] = $mailbcc;
|
|
|
|
|
|
|
|
}
|
|
|
|
if (!empty($identity_arr['bcc'])) {
|
|
|
|
if (!empty($identity_arr['bcc'])) {
|
|
|
|
$headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
|
|
|
|
$headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
|
|
|
|
$RECIPIENT_COUNT ++;
|
|
|
|
$RECIPIENT_COUNT ++;
|
|
|
@ -319,37 +319,43 @@ if (($max_recipients = (int) $RCMAIL->config->get('max_recipients')) > 0) {
|
|
|
|
// add subject
|
|
|
|
// add subject
|
|
|
|
$headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, TRUE, $message_charset));
|
|
|
|
$headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, TRUE, $message_charset));
|
|
|
|
|
|
|
|
|
|
|
|
if (!empty($identity_arr['organization']))
|
|
|
|
if (!empty($identity_arr['organization'])) {
|
|
|
|
$headers['Organization'] = $identity_arr['organization'];
|
|
|
|
$headers['Organization'] = $identity_arr['organization'];
|
|
|
|
|
|
|
|
}
|
|
|
|
if (!empty($_POST['_replyto'])) {
|
|
|
|
if (!empty($_POST['_replyto'])) {
|
|
|
|
$reply_to = rcmail_email_input_format(get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset));
|
|
|
|
$headers['Reply-To'] = rcmail_email_input_format(get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset));
|
|
|
|
$headers['Reply-To'] = $reply_to;
|
|
|
|
|
|
|
|
$headers['Mail-Reply-To'] = $reply_to;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (!empty($identity_arr['reply-to']))
|
|
|
|
else if (!empty($identity_arr['reply-to'])) {
|
|
|
|
$headers['Reply-To'] = rcmail_email_input_format($identity_arr['reply-to'], false, true);
|
|
|
|
$headers['Reply-To'] = rcmail_email_input_format($identity_arr['reply-to'], false, true);
|
|
|
|
|
|
|
|
}
|
|
|
|
if (!empty($_POST['_followupto']))
|
|
|
|
if (!empty($headers['Reply-To'])) {
|
|
|
|
|
|
|
|
$headers['Mail-Reply-To'] = $headers['Reply-To'];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!empty($_POST['_followupto'])) {
|
|
|
|
$headers['Mail-Followup-To'] = rcmail_email_input_format(get_input_value('_followupto', RCUBE_INPUT_POST, TRUE, $message_charset));
|
|
|
|
$headers['Mail-Followup-To'] = rcmail_email_input_format(get_input_value('_followupto', RCUBE_INPUT_POST, TRUE, $message_charset));
|
|
|
|
|
|
|
|
}
|
|
|
|
if (!empty($_SESSION['compose']['reply_msgid']))
|
|
|
|
if (!empty($_SESSION['compose']['reply_msgid'])) {
|
|
|
|
$headers['In-Reply-To'] = $_SESSION['compose']['reply_msgid'];
|
|
|
|
$headers['In-Reply-To'] = $_SESSION['compose']['reply_msgid'];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// remember reply/forward UIDs in special headers
|
|
|
|
// remember reply/forward UIDs in special headers
|
|
|
|
if (!empty($_SESSION['compose']['reply_uid']) && $savedraft)
|
|
|
|
if (!empty($_SESSION['compose']['reply_uid']) && $savedraft) {
|
|
|
|
$headers['X-Draft-Info'] = array('type' => 'reply', 'uid' => $_SESSION['compose']['reply_uid']);
|
|
|
|
$headers['X-Draft-Info'] = array('type' => 'reply', 'uid' => $_SESSION['compose']['reply_uid']);
|
|
|
|
else if (!empty($_SESSION['compose']['forward_uid']) && $savedraft)
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (!empty($_SESSION['compose']['forward_uid']) && $savedraft) {
|
|
|
|
$headers['X-Draft-Info'] = array('type' => 'forward', 'uid' => $_SESSION['compose']['forward_uid']);
|
|
|
|
$headers['X-Draft-Info'] = array('type' => 'forward', 'uid' => $_SESSION['compose']['forward_uid']);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!empty($_SESSION['compose']['references']))
|
|
|
|
if (!empty($_SESSION['compose']['references'])) {
|
|
|
|
$headers['References'] = $_SESSION['compose']['references'];
|
|
|
|
$headers['References'] = $_SESSION['compose']['references'];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!empty($_POST['_priority'])) {
|
|
|
|
if (!empty($_POST['_priority'])) {
|
|
|
|
$priority = intval($_POST['_priority']);
|
|
|
|
$priority = intval($_POST['_priority']);
|
|
|
|
$a_priorities = array(1=>'highest', 2=>'high', 4=>'low', 5=>'lowest');
|
|
|
|
$a_priorities = array(1=>'highest', 2=>'high', 4=>'low', 5=>'lowest');
|
|
|
|
if ($str_priority = $a_priorities[$priority])
|
|
|
|
if ($str_priority = $a_priorities[$priority]) {
|
|
|
|
$headers['X-Priority'] = sprintf("%d (%s)", $priority, ucfirst($str_priority));
|
|
|
|
$headers['X-Priority'] = sprintf("%d (%s)", $priority, ucfirst($str_priority));
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!empty($_POST['_receipt'])) {
|
|
|
|
if (!empty($_POST['_receipt'])) {
|
|
|
@ -361,11 +367,12 @@ if (!empty($_POST['_receipt'])) {
|
|
|
|
$headers['Message-ID'] = $message_id;
|
|
|
|
$headers['Message-ID'] = $message_id;
|
|
|
|
$headers['X-Sender'] = $from;
|
|
|
|
$headers['X-Sender'] = $from;
|
|
|
|
|
|
|
|
|
|
|
|
if (is_array($headers['X-Draft-Info']))
|
|
|
|
if (is_array($headers['X-Draft-Info'])) {
|
|
|
|
$headers['X-Draft-Info'] = rcmail_draftinfo_encode($headers['X-Draft-Info'] + array('folder' => $_SESSION['compose']['mailbox']));
|
|
|
|
$headers['X-Draft-Info'] = rcmail_draftinfo_encode($headers['X-Draft-Info'] + array('folder' => $_SESSION['compose']['mailbox']));
|
|
|
|
|
|
|
|
}
|
|
|
|
if (!empty($CONFIG['useragent']))
|
|
|
|
if (!empty($CONFIG['useragent'])) {
|
|
|
|
$headers['User-Agent'] = $CONFIG['useragent'];
|
|
|
|
$headers['User-Agent'] = $CONFIG['useragent'];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// exec hook for header checking and manipulation
|
|
|
|
// exec hook for header checking and manipulation
|
|
|
|
$data = $RCMAIL->plugins->exec_hook('message_outgoing_headers', array('headers' => $headers));
|
|
|
|
$data = $RCMAIL->plugins->exec_hook('message_outgoing_headers', array('headers' => $headers));
|
|
|
|