diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcube_imap_generic.php | 3 | ||||
| -rw-r--r-- | program/include/rcube_message.php | 6 | ||||
| -rw-r--r-- | program/js/app.js | 35 | ||||
| -rw-r--r-- | program/localization/en_US/labels.inc | 10 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 95 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 36 | ||||
| -rw-r--r-- | program/steps/mail/sendmail.inc | 5 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 2 |
8 files changed, 150 insertions, 42 deletions
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php index 160c154c1..95e1180c5 100644 --- a/program/include/rcube_imap_generic.php +++ b/program/include/rcube_imap_generic.php @@ -1071,7 +1071,8 @@ class rcube_imap_generic $request .= "(DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC "; $request .= "CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID "; $request .= "REFERENCES DISPOSITION-NOTIFICATION-TO X-PRIORITY "; - $request .= "X-DRAFT-INFO".$add.")])"; + $request .= "X-DRAFT-INFO LIST-POST MAIL-FOLLOWUP-TO MAIL-REPLY-TO "; + $request .= "RETURN-PATH".$add.")])"; if (!$this->putLine($request)) { return false; diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php index 4351f17f5..6a6186d47 100644 --- a/program/include/rcube_message.php +++ b/program/include/rcube_message.php @@ -115,7 +115,11 @@ class rcube_message */ public function get_header($name, $raw = false) { - $value = $this->headers->$name; + if ($this->headers->$name) + $value = $this->headers->$name; + else if ($this->headers->others[$name]) + $value = $this->headers->others[$name]; + return $raw ? $value : $this->imap->decode_header($value); } diff --git a/program/js/app.js b/program/js/app.js index f4e8e2f73..4388c5094 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -199,11 +199,13 @@ function rcube_webmail() if (this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox) this.set_alttext('delete', 'movemessagetotrash'); - this.env.message_commands = ['show', 'reply', 'reply-all', 'forward', 'moveto', 'copy', 'delete', - 'open', 'mark', 'edit', 'viewsource', 'download', 'print', 'load-attachment', 'load-headers']; + this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list', 'forward', + 'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download', + 'print', 'load-attachment', 'load-headers']; if (this.env.action=='show' || this.env.action=='preview') { this.enable_command(this.env.message_commands, this.env.uid); + this.enable_command('reply-list', this.env.list_post); if (this.env.next_uid) { this.enable_command('nextmessage', 'lastmessage', true); @@ -882,10 +884,19 @@ function rcube_webmail() break; case 'reply-all': + case 'reply-list': case 'reply': var uid; - if (uid = this.get_single_uid()) - this.goto_url('compose', '_reply_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(command=='reply-all' ? '&_all=1' : ''), true); + if (uid = this.get_single_uid()) { + var url = '_reply_uid='+uid+'&_mbox='+urlencode(this.env.mailbox); + if (command == 'reply-all') + // do reply-list, when list is detected and popup menu wasn't used + url += '&_all=' + (!props && this.commands['reply-list'] ? 'list' : 'all'); + else if (command == 'reply-list') + url += '&_all=list'; + + this.goto_url('compose', url, true); + } break; case 'forward': @@ -1366,9 +1377,16 @@ function rcube_webmail() var selected = list.get_single_selection() != null; this.enable_command(this.env.message_commands, selected); - // Hide certain command buttons when Drafts folder is selected - if (selected && this.env.mailbox == this.env.drafts_mailbox) { - this.enable_command('reply', 'reply-all', 'forward', false); + if (selected) { + // Hide certain command buttons when Drafts folder is selected + if (this.env.mailbox == this.env.drafts_mailbox) + this.enable_command('reply', 'reply-all', 'reply-list', 'forward', false); + // Disable reply-list when List-Post header is not set + else { + var msg = this.env.messages[list.get_single_selection()]; + if (!msg.ml) + this.enable_command('reply-list', false); + } } // Multi-message commands this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false)); @@ -1546,6 +1564,7 @@ function rcube_webmail() unread_children: flags.unread_children?flags.unread_children:0, parent_uid: flags.parent_uid?flags.parent_uid:0, selected: this.select_all_mode || this.message_list.in_selection(uid), + ml: flags.ml?1:0, // flags from plugins flags: flags.extra_flags }); @@ -5015,6 +5034,8 @@ function rcube_webmail() if (this.env.action == 'show') { // re-enable commands on move/delete error this.enable_command(this.env.message_commands, true); + if (!this.env.list_post) + this.enable_command('reply-list', false); } else if (this.task == 'addressbook') { this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount }); diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 5287f8beb..4de05156d 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -46,6 +46,8 @@ $labels['to'] = 'Recipient'; $labels['cc'] = 'Copy'; $labels['bcc'] = 'Bcc'; $labels['replyto'] = 'Reply-To'; +$labels['mailreplyto'] = 'Mail-Reply-To'; +$labels['mailfollowupto'] = 'Mail-Followup-To'; $labels['date'] = 'Date'; $labels['size'] = 'Size'; $labels['priority'] = 'Priority'; @@ -53,6 +55,8 @@ $labels['organization'] = 'Organization'; // aliases $labels['reply-to'] = $labels['replyto']; +$labels['mailreply-to'] = $labels['mailreplyto']; +$labels['mailfollowup-to'] = $labels['mailfollowupto']; $labels['mailboxlist'] = 'Folders'; $labels['messagesfromto'] = 'Messages $from to $to of $count'; @@ -121,7 +125,9 @@ $labels['today'] = 'Today'; $labels['checkmail'] = 'Check for new messages'; $labels['writenewmessage'] = 'Create a new message'; $labels['replytomessage'] = 'Reply to sender'; -$labels['replytoallmessage'] = 'Reply to sender and all recipients'; +$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients'; +$labels['replyall'] = 'Reply all'; +$labels['replylist'] = 'Reply list'; $labels['forwardmessage'] = 'Forward the message'; $labels['deletemessage'] = 'Delete message'; $labels['movemessagetotrash'] = 'Move message to trash'; @@ -233,6 +239,8 @@ $labels['maxuploadsize'] = 'Maximum allowed file size is $size'; $labels['addcc'] = 'Add Cc'; $labels['addbcc'] = 'Add Bcc'; $labels['addreplyto'] = 'Add Reply-To'; +$labels['addmailreplyto'] = 'Add Mail-Reply-To'; +$labels['addmailfollowupto'] = 'Add Mail-Followup-To'; // mdn $labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?'; diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index b9594a09f..c69a0a12f 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -166,7 +166,7 @@ if (!empty($msg_uid)) $_SESSION['compose']['references'] = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID); if (!empty($_SESSION['compose']['param']['all'])) - $MESSAGE->reply_all = 1; + $MESSAGE->reply_all = $_SESSION['compose']['param']['all']; $OUTPUT->set_env('compose_mode', 'reply'); } @@ -245,6 +245,24 @@ function rcmail_compose_headers($attrib) case 'reply-to': $fname = '_replyto'; $param = 'replyto'; + $header = 'reply-to'; + + case 'mailreplyto': + case 'mailreply-to': + if (!$fname) { + $fname = '_mailreplyto'; + $param = 'mailreplyto'; + $header = 'mailreply-to'; + } + + case 'mailfollowupto': + case 'mailfollowup-to': + if (!$fname) { + $fname = '_mailfollowupto'; + $param = 'mailfollowupto'; + $header = 'mailfollowup-to'; + } + $allow_attrib = array('id', 'class', 'style', 'size', 'tabindex'); $field_type = 'html_inputfield'; break; @@ -258,15 +276,26 @@ function rcmail_compose_headers($attrib) } else if ($header && $compose_mode == RCUBE_COMPOSE_REPLY) { // get recipent address(es) out of the message headers - if ($header=='to' && !empty($MESSAGE->headers->replyto)) - $fvalue = $MESSAGE->headers->replyto; - else if ($header=='to' && !empty($MESSAGE->headers->from)) - $fvalue = $MESSAGE->headers->from; + if ($header == 'to') { + $mailfollowup = $MESSAGE->headers->others['mail-followup-to']; + $mailreplyto = $MESSAGE->headers->others['mail-reply-to']; + + 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 ($mailreplyto) + $fvalue = $mailreplyto; + else if (!empty($MESSAGE->headers->replyto)) + $fvalue = $MESSAGE->headers->replyto; + else if (!empty($MESSAGE->headers->from)) + $fvalue = $MESSAGE->headers->from; + } // add recipent of original message if reply to all - else if ($header=='cc' && !empty($MESSAGE->reply_all)) { + else if ($header == 'cc' && !empty($MESSAGE->reply_all) && $MESSAGE->reply_all != 'list') { if ($v = $MESSAGE->headers->to) $fvalue .= $v; - if ($v = $MESSAGE->headers->cc) $fvalue .= (!empty($fvalue) ? ', ' : '') . $v; } @@ -305,6 +334,12 @@ function rcmail_compose_headers($attrib) $fvalue = $MESSAGE->get_header('cc'); else if ($header=='bcc' && !empty($MESSAGE->headers->bcc)) $fvalue = $MESSAGE->get_header('bcc'); + else if ($header=='reply-to' && !empty($MESSAGE->headers->replyto)) + $fvalue = $MESSAGE->get_header('reply-to'); + else if ($header=='mail-reply-to' && !empty($MESSAGE->headers->others['mail-reply-to'])) + $fvalue = $MESSAGE->get_header('followup-to'); + else if ($header=='mail-followup-to' && !empty($MESSAGE->headers->others['mail-followup-to'])) + $fvalue = $MESSAGE->get_header('mail-followup-to'); $addresses = $IMAP->decode_address_list($fvalue); $fvalue = ''; @@ -364,7 +399,7 @@ function rcmail_compose_header_from($attrib) foreach ($a_to as $addr) { if (!empty($addr['mailto'])) - $a_recipients[] = mb_strtolower(idn_to_utf8($addr['mailto'])); + $a_recipients[] = strtolower($addr['mailto']); } if (!empty($MESSAGE->headers->cc)) @@ -373,7 +408,7 @@ function rcmail_compose_header_from($attrib) foreach ($a_cc as $addr) { if (!empty($addr['mailto'])) - $a_recipients[] = mb_strtolower(idn_to_utf8($addr['mailto'])); + $a_recipients[] = strtolower($addr['mailto']); } } } @@ -383,17 +418,17 @@ function rcmail_compose_header_from($attrib) if (count($user_identities)) { - $from_id = 0; $a_signatures = array(); $field_attrib['onchange'] = JS_OBJECT_NAME.".change_identity(this)"; $select_from = new html_select($field_attrib); + // create SELECT element foreach ($user_identities as $sql_arr) { - $sql_arr['email'] = mb_strtolower(idn_to_utf8($sql_arr['email'])); + $email = mb_strtolower(idn_to_utf8($sql_arr['email'])); $identity_id = $sql_arr['identity_id']; - $select_from->add(format_email_recipient($sql_arr['email'], $sql_arr['name']), $identity_id); + $select_from->add(format_email_recipient($email, $sql_arr['name']), $identity_id); // add signature to array if (!empty($sql_arr['signature']) && empty($_SESSION['compose']['param']['nosig'])) @@ -408,24 +443,38 @@ function rcmail_compose_header_from($attrib) } if ($compose_mode == RCUBE_COMPOSE_REPLY && is_array($MESSAGE->compose_from)) - $MESSAGE->compose_from[] = $sql_arr['email']; - - 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'])) - $from_id = $sql_arr['identity_id']; - // set identity if it's one of the reply-message recipients (with prio for default identity) - else if (in_array($sql_arr['email'], $a_recipients) && (empty($from_id) || $sql_arr['standard'])) - $from_id = $sql_arr['identity_id']; - } + $MESSAGE->compose_from[] = $email; } + $from_id = 0; + // 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']; + else { + $return_path = $MESSAGE->headers->others['return-path']; + + // Set identity + foreach ($user_identities as $sql_arr) { + // set draft's identity + if ($compose_mode == RCUBE_COMPOSE_DRAFT) { + if (strstr($MESSAGE->headers->from, $sql_arr['email'])) + $from_id = $sql_arr['identity_id']; + break; + } + // set identity if it's one of the reply-message recipients (with prio for default identity) + else if (in_array($sql_arr['email'], $a_recipients) && (empty($from_id) || $sql_arr['standard'])) + $from_id = $sql_arr['identity_id']; + // set identity when replying to mailing list + else if (strpos($return_path, str_replace('@', '=', $sql_arr['email']).'@') !== false) + $from_id = $sql_arr['identity_id']; + + if ($from_id) + break; + } + } $out = $select_from->show($from_id); diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 2bb2dc884..aad127cfc 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -338,6 +338,8 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null $a_msg_flags['forwarded'] = 1; if ($header->flagged) $a_msg_flags['flagged'] = 1; + if ($header->others['list-post']) + $a_msg_flags['ml'] = 1; if (preg_match("/(application\/|multipart\/m)/i", $header->ctype)) $a_msg_flags['attachment'] = 1; $a_msg_flags['mbox'] = $mbox; @@ -942,33 +944,49 @@ function rcmail_message_headers($attrib, $headers=NULL) $headers = is_object($MESSAGE->headers) ? get_object_vars($MESSAGE->headers) : $MESSAGE->headers; // show these headers - $standard_headers = array('subject', 'from', 'to', 'cc', 'bcc', 'replyto', 'date'); + $standard_headers = array('subject', 'from', 'to', 'cc', 'bcc', 'replyto', + 'mail-reply-to', 'mail-followup-to', 'date'); $output_headers = array(); foreach ($standard_headers as $hkey) { - if (!$headers[$hkey]) + if ($headers[$hkey]) + $value = $headers[$hkey]; + else if ($headers['others'][$hkey]) + $value = $headers['others'][$hkey]; + else continue; if ($hkey == 'date') { if ($PRINT_MODE) - $header_value = format_date($headers[$hkey], $RCMAIL->config->get('date_long', 'x')); + $header_value = format_date($value, $RCMAIL->config->get('date_long', 'x')); else - $header_value = format_date($headers[$hkey]); + $header_value = format_date($value); } else if ($hkey == 'replyto') { if ($headers['replyto'] != $headers['from']) - $header_value = rcmail_address_string($headers['replyto'], null, true, $attrib['addicon']); + $header_value = rcmail_address_string($value, null, true, $attrib['addicon']); else continue; } + else if ($hkey == 'mail-reply-to') { + if ($headers['mail-replyto'] != $headers['reply-to'] + && $headers['reply-to'] != $headers['from'] + ) + $header_value = rcmail_address_string($value, null, true, $attrib['addicon']); + else + continue; + } + else if ($hkey == 'mail-followup-to') { + $header_value = rcmail_address_string($value, null, true, $attrib['addicon']); + } else if (in_array($hkey, array('from', 'to', 'cc', 'bcc'))) - $header_value = rcmail_address_string($headers[$hkey], null, true, $attrib['addicon']); - else if ($hkey == 'subject' && empty($headers[$hkey])) + $header_value = rcmail_address_string($value, null, true, $attrib['addicon']); + else if ($hkey == 'subject' && empty($value)) $header_value = rcube_label('nosubject'); else - $header_value = trim($IMAP->decode_header($headers[$hkey])); + $header_value = trim($IMAP->decode_header($value)); - $output_headers[$hkey] = array('title' => rcube_label($hkey), 'value' => $header_value, 'raw' => $headers[$hkey]); + $output_headers[$hkey] = array('title' => rcube_label($hkey), 'value' => $header_value, 'raw' => $value); } $plugin = $RCMAIL->plugins->exec_hook('message_headers_output', array('output' => $output_headers, 'headers' => $MESSAGE->headers)); diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 45afa046f..a9ecf2ea2 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -314,6 +314,11 @@ if (!empty($_POST['_replyto'])) else if (!empty($identity_arr['reply-to'])) $headers['Reply-To'] = rcmail_email_input_format($identity_arr['reply-to'], false, true); +if (!empty($_POST['_mailfollowupto'])) + $headers['Mail-Followup-To'] = rcmail_email_input_format(get_input_value('_mailfollowupto', RCUBE_INPUT_POST, TRUE, $message_charset)); +if (!empty($_POST['_mailreplyto'])) + $headers['Mail-Reply-To'] = rcmail_email_input_format(get_input_value('_mailreplyto', RCUBE_INPUT_POST, TRUE, $message_charset)); + if (!empty($_SESSION['compose']['reply_msgid'])) $headers['In-Reply-To'] = $_SESSION['compose']['reply_msgid']; diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index bc208ab7c..3b357ac88 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -61,6 +61,8 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) { $OUTPUT->set_env('skip_deleted', true); if ($CONFIG['display_next']) $OUTPUT->set_env('display_next', true); + if ($MESSAGE->headers->others['list-post']) + $OUTPUT->set_env('list_post', true); if (!$OUTPUT->ajax_call) $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage'); |