summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG1
-rw-r--r--program/js/app.js2
-rw-r--r--program/localization/en_GB/labels.inc9
-rw-r--r--program/localization/en_US/labels.inc11
-rw-r--r--program/localization/pl_PL/labels.inc11
-rw-r--r--program/steps/mail/compose.inc20
-rw-r--r--program/steps/mail/func.inc8
-rw-r--r--program/steps/mail/sendmail.inc13
-rw-r--r--program/steps/settings/edit_identity.inc3
-rw-r--r--skins/default/functions.js2
-rw-r--r--skins/default/mail.css3
-rw-r--r--skins/default/templates/compose.html18
12 files changed, 37 insertions, 64 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 85b65ef9d..c99e6ebc2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@ CHANGELOG Roundcube Webmail
- Add confirmation message on purge/expunge command response
- Fix handling of untagged responses for AUTHENTICATE command (#1487450)
- Add username and IP address to log message on unsuccessful login (#1487626)
+- Improved Mail-Followup-To and Mail-Reply-To headers handling
RELEASE 0.5-BETA
----------------
diff --git a/program/js/app.js b/program/js/app.js
index e88e19f69..90c18b6e6 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2819,7 +2819,7 @@ function rcube_webmail()
input_subject = $("input[name='_subject']"),
input_message = $("[name='_message']").get(0),
html_mode = $("input[name='_is_html']").val() == '1',
- ac_fields = ['cc', 'bcc', 'replyto', 'mailreplyto', 'mailfollowupto'];
+ ac_fields = ['cc', 'bcc', 'replyto', 'followupto'];
// init live search events
this.init_address_input_events(input_to);
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index cd61ed648..7a36f007e 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -38,16 +38,12 @@ $labels['to'] = 'Recipient';
$labels['cc'] = 'Copy';
$labels['bcc'] = 'Bcc';
$labels['replyto'] = 'Reply-To';
-$labels['mailreplyto'] = 'Mail-Reply-To';
-$labels['mailfollowupto'] = 'Mail-Followup-To';
+$labels['followupto'] = 'Followup-To';
$labels['date'] = 'Date';
$labels['size'] = 'Size';
$labels['priority'] = 'Priority';
$labels['organization'] = 'Organisation';
$labels['readstatus'] = 'Read status';
-$labels['reply-to'] = $labels['replyto'];
-$labels['mail-reply-to'] = $labels['mailreplyto'];
-$labels['mail-followup-to'] = $labels['mailfollowupto'];
$labels['mailboxlist'] = 'Folders';
$labels['messagesfromto'] = 'Messages $from to $to of $count';
$labels['threadsfromto'] = 'Threads $from to $to of $count';
@@ -201,8 +197,7 @@ $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';
+$labels['addfollowupto'] = 'Add Followup-To';
$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
$labels['receiptread'] = 'Return Receipt (read)';
$labels['yourmessage'] = 'This is a Return Receipt for your message';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 6b759bb26..22be28ec8 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -46,19 +46,13 @@ $labels['to'] = 'Recipient';
$labels['cc'] = 'Copy';
$labels['bcc'] = 'Bcc';
$labels['replyto'] = 'Reply-To';
-$labels['mailreplyto'] = 'Mail-Reply-To';
-$labels['mailfollowupto'] = 'Mail-Followup-To';
+$labels['followupto'] = 'Followup-To';
$labels['date'] = 'Date';
$labels['size'] = 'Size';
$labels['priority'] = 'Priority';
$labels['organization'] = 'Organization';
$labels['readstatus'] = 'Read status';
-// aliases
-$labels['reply-to'] = $labels['replyto'];
-$labels['mail-reply-to'] = $labels['mailreplyto'];
-$labels['mail-followup-to'] = $labels['mailfollowupto'];
-
$labels['mailboxlist'] = 'Folders';
$labels['messagesfromto'] = 'Messages $from to $to of $count';
$labels['threadsfromto'] = 'Threads $from to $to of $count';
@@ -241,8 +235,7 @@ $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';
+$labels['addfollowupto'] = 'Add 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/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 8c52cdf06..6cde0469d 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -42,13 +42,12 @@ $labels['from'] = 'Nadawca';
$labels['to'] = 'Odbiorca';
$labels['cc'] = 'Kopia';
$labels['bcc'] = 'Ukryta kopia';
-$labels['replyto'] = 'Odp. do';
+$labels['replyto'] = 'Odpowiedź do';
$labels['date'] = 'Data';
$labels['size'] = 'Rozmiar';
$labels['readstatus'] = 'Przeczytano';
$labels['priority'] = 'Priorytet';
$labels['organization'] = 'Organizacja';
-$labels['reply-to'] = 'Odpowiedz do';
$labels['mailboxlist'] = 'Foldery';
$labels['messagesfromto'] = 'Wiadomości od $from do $to z $count';
$labels['threadsfromto'] = 'Wątki od $from do $to z $count';
@@ -348,15 +347,11 @@ $labels['chinese'] = 'chiński';
$labels['folderactions'] = 'Działania na folderach...';
$labels['contacts'] = 'Kontakty';
$labels['messageoptions'] = 'Opcje wiadomości...';
-$labels['mailreplyto'] = 'Mail-Reply-To';
-$labels['mailfollowupto'] = 'Mail-Followup-To';
-$labels['mail-reply-to'] = 'Mail-Reply-To';
-$labels['mail-followup-to'] = 'Mail-Followup-To';
+$labels['followupto'] = 'Kontynuacja do';
$labels['replyall'] = 'Odpowiedz wszystkim';
$labels['replylist'] = 'Odpowiedz na listę';
$labels['editidents'] = 'Edytuj tożsamości';
-$labels['addmailreplyto'] = 'Dodaj Mail-Reply-To';
-$labels['addmailfollowupto'] = 'Dodaj Mail-Followup-To';
+$labels['addfollowupto'] = 'Dodaj Followup-To';
$labels['dsn'] = 'Status dostarczenia (DSN)';
$labels['reqdsn'] = 'Zawsze żądaj statusu dostarczenia (DSN)';
$labels['replysamefolder'] = 'Umieszczaj odpowiedzi w folderze wiadomości, na którą odpowiadam';
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 8358559a6..45b95c937 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -267,19 +267,11 @@ function rcmail_compose_headers($attrib)
$param = 'replyto';
$header = 'reply-to';
- case 'mailreplyto':
- case 'mail-reply-to':
+ case 'followupto':
+ case 'followup-to':
if (!$fname) {
- $fname = '_mailreplyto';
- $param = 'mailreplyto';
- $header = 'mail-reply-to';
- }
-
- case 'mailfollowupto':
- case 'mail-followup-to':
- if (!$fname) {
- $fname = '_mailfollowupto';
- $param = 'mailfollowupto';
+ $fname = '_followupto';
+ $param = 'followupto';
$header = 'mail-followup-to';
}
@@ -354,10 +346,10 @@ 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->others['mail-reply-to']))
+ $fvalue = $MESSAGE->get_header('mail-reply-to');
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');
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 9e485eb36..750cf6f61 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -927,10 +927,14 @@ function rcmail_message_headers($attrib, $headers=NULL)
else
$header_value = trim($IMAP->decode_header($value));
- $output_headers[$hkey] = array('title' => rcube_label($hkey), 'value' => $header_value, 'raw' => $value);
+ $output_headers[$hkey] = array(
+ 'title' => rcube_label(preg_replace('/(^mail-|-)/', '', $hkey)),
+ 'value' => $header_value, 'raw' => $value
+ );
}
- $plugin = $RCMAIL->plugins->exec_hook('message_headers_output', array('output' => $output_headers, 'headers' => $MESSAGE->headers));
+ $plugin = $RCMAIL->plugins->exec_hook('message_headers_output',
+ array('output' => $output_headers, 'headers' => $MESSAGE->headers));
// compose html table
$table = new html_table(array('cols' => 2));
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index a796c7ba7..07f32b8ac 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -322,15 +322,16 @@ $headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, TRUE, $
if (!empty($identity_arr['organization']))
$headers['Organization'] = $identity_arr['organization'];
-if (!empty($_POST['_replyto']))
- $headers['Reply-To'] = rcmail_email_input_format(get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset));
+if (!empty($_POST['_replyto'])) {
+ $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']))
$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($_POST['_followupto']))
+ $headers['Mail-Followup-To'] = rcmail_email_input_format(get_input_value('_followupto', 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/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index ef2be6584..f458cbfee 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -126,7 +126,8 @@ function rcube_identity_form($attrib)
foreach ($fieldset['content'] as $col => $colprop) {
$colprop['id'] = 'rcmfd_'.$col;
- $label = !empty($colprop['label']) ? $colprop['label'] : rcube_label($col);
+ $label = !empty($colprop['label']) ? $colprop['label'] :
+ rcube_label(str_replace('-', '', $col));
$value = !empty($colprop['value']) ? $colprop['value'] :
rcmail_get_edit_field($col, $IDENTITY_RECORD[$col], $colprop, $colprop['type']);
diff --git a/skins/default/functions.js b/skins/default/functions.js
index 3197c9847..77cdeb8d2 100644
--- a/skins/default/functions.js
+++ b/skins/default/functions.js
@@ -353,7 +353,7 @@ switch_preview_pane: function(elem)
/* Message composing */
init_compose_form: function()
{
- var f, field, fields = ['cc', 'bcc', 'replyto', 'mailreplyto', 'mailfollowupto'],
+ var f, field, fields = ['cc', 'bcc', 'replyto', 'followupto'],
div = document.getElementById('compose-div'),
headers_div = document.getElementById('compose-headers-div');
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 2cd51e542..7bb308c06 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -1337,8 +1337,7 @@ input.from_address
#compose-cc,
#compose-bcc,
#compose-replyto,
-#compose-mailreplyto,
-#compose-mailfollowupto
+#compose-followupto
{
display: none;
}
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 99015abee..2dcf8b0c1 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -78,18 +78,12 @@
<label for="_replyto"><roundcube:label name="replyto" /></label>
</td>
<td class="editfield"><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /></td>
- </tr><tr id="compose-mailreplyto">
+ </tr><tr id="compose-followupto">
<td class="title top">
- <a href="#mailreplyto" onclick="return rcmail_ui.hide_header_form('mailreplyto');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a>
- <label for="_mailreplyto"><roundcube:label name="mailreplyto" /></label>
+ <a href="#followupto" onclick="return rcmail_ui.hide_header_form('followupto');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a>
+ <label for="_followupto"><roundcube:label name="followupto" /></label>
</td>
- <td class="editfield"><roundcube:object name="composeHeaders" part="mailreplyto" form="form" id="_mailreplyto" size="70" tabindex="6" /></td>
- </tr><tr id="compose-mailfollowupto">
- <td class="title top">
- <a href="#mailfollowupto" onclick="return rcmail_ui.hide_header_form('mailfollowupto');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a>
- <label for="_mailfollowupto"><roundcube:label name="mailfollowupto" /></label>
- </td>
- <td class="editfield"><roundcube:object name="composeHeaders" part="mailfollowupto" form="form" id="_mailfollowupto" size="70" tabindex="7" /></td>
+ <td class="editfield"><roundcube:object name="composeHeaders" part="followupto" form="form" id="_followupto" size="70" tabindex="7" /></td>
</tr><tr>
<td></td>
<td class="formlinks">
@@ -99,9 +93,7 @@
<span class="separator">|</span>
<a href="#reply-to" onclick="return rcmail_ui.show_header_form('replyto')" id="replyto-link"><roundcube:label name="addreplyto" /></a>
<span class="separator">|</span>
- <a href="#mailreply-to" onclick="return rcmail_ui.show_header_form('mailreplyto')" id="mailreplyto-link"><roundcube:label name="addmailreplyto" /></a>
- <span class="separator">|</span>
- <a href="#mailfollowup-to" onclick="return rcmail_ui.show_header_form('mailfollowupto')" id="mailfollowupto-link"><roundcube:label name="addmailfollowupto" /></a>
+ <a href="#followup-to" onclick="return rcmail_ui.show_header_form('followupto')" id="followupto-link"><roundcube:label name="addfollowupto" /></a>
</td>
</tr><tr>
<td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 10:35:13 +0000