summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-09-26 08:13:21 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-09-26 08:13:21 +0000
commit826ca199b8adaf3046ad4a8a10034934544a2e10 (patch)
tree5ebcf2f90431150680ebe548bd3a8ae96de986eb /roundcubemail/program
parent43b6fc24c68063d8542cfc49d6fa160239bd5163 (diff)
Improve message compose screen
git-svn-id: https://svn.roundcube.net/trunk@816 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/localization/de_CH/labels.inc4
-rw-r--r--roundcubemail/program/localization/en_US/labels.inc4
-rw-r--r--roundcubemail/program/steps/mail/sendmail.inc4
3 files changed, 11 insertions, 1 deletions
diff --git a/roundcubemail/program/localization/de_CH/labels.inc b/roundcubemail/program/localization/de_CH/labels.inc
index d5e088eda..f30097846 100644
--- a/roundcubemail/program/localization/de_CH/labels.inc
+++ b/roundcubemail/program/localization/de_CH/labels.inc
@@ -157,6 +157,10 @@ $labels['showimages'] = 'Bilder anzeigen';
$labels['htmltoggle'] = 'HTML';
$labels['plaintoggle'] = 'Klartext';
+$labels['addcc'] = 'Cc hinzufügen';
+$labels['addbcc'] = 'Bcc hinzufügen';
+$labels['addreplyto'] = 'Antwortadresse hinzufügen';
+
// address book // Adressbuch
$labels['name'] = 'Anzeigename';
diff --git a/roundcubemail/program/localization/en_US/labels.inc b/roundcubemail/program/localization/en_US/labels.inc
index c4b71416c..4c5e80a97 100644
--- a/roundcubemail/program/localization/en_US/labels.inc
+++ b/roundcubemail/program/localization/en_US/labels.inc
@@ -156,6 +156,10 @@ $labels['showimages'] = 'Display images';
$labels['htmltoggle'] = 'HTML';
$labels['plaintoggle'] = 'Plain text';
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+
// address boook
$labels['name'] = 'Display name';
diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc
index 7a87d2e91..f1fd090d9 100644
--- a/roundcubemail/program/steps/mail/sendmail.inc
+++ b/roundcubemail/program/steps/mail/sendmail.inc
@@ -186,7 +186,9 @@ $headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, FALSE,
if (!empty($identity_arr['organization']))
$headers['Organization'] = $identity_arr['organization'];
-if (!empty($identity_arr['reply-to']))
+if (!empty($_POST['_replyto']))
+ $headers['Reply-To'] = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset));
+else if (!empty($identity_arr['reply-to']))
$headers['Reply-To'] = $identity_arr['reply-to'];
if (!empty($_SESSION['compose']['reply_msgid']))