From ecb9fb058da8d0f5a8e59402c1c1ced21122cbc5 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 22 Jun 2009 12:20:34 -0400
Subject: [PATCH] - use RCMAIL_CHARSET instead of hardcoded 'utf-8'
---
program/steps/mail/sendmail.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index bfdf0de..d550a42 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -212,11 +212,11 @@
$mailto = 'undisclosed-recipients:;';
// get sender name and address
-$from = get_input_value('_from', RCUBE_INPUT_POST);
+$from = get_input_value('_from', RCUBE_INPUT_POST, true, $message_charset);
$identity_arr = rcmail_get_identity($from);
if (!$identity_arr && ($from = rcmail_email_input_format($from))) {
- if (preg_match('/(<\S+@\S+)/', $from, $m))
+ if (preg_match('/(\S+@\S+)/', $from, $m))
$identity_arr['mailto'] = $m[1];
} else
$from = $identity_arr['mailto'];
@@ -311,7 +311,7 @@
// generic footer for all messages
if (!empty($CONFIG['generic_message_footer'])) {
$footer = file_get_contents(realpath($CONFIG['generic_message_footer']));
- $footer = rcube_charset_convert($footer, 'UTF-8', $message_charset);
+ $footer = rcube_charset_convert($footer, RCMAIL_CHARSET, $message_charset);
}
}
--
Gitblit v1.9.1