summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorsvncommit <devs@roundcube.net>2006-12-03 22:32:16 +0000
committersvncommit <devs@roundcube.net>2006-12-03 22:32:16 +0000
commitdd792e8253f6fa94eba4e95293a32f8bc91289bb (patch)
tree5c883e994ef1086fa6bfddb300851812456cb7df /program/steps/mail
parent733c78f4747c7f894a8c3c7a752efca6a196f875 (diff)
fixed signature issues
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/compose.inc7
1 files changed, 7 insertions, 0 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 76aa78f4b..6e1126b86 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -20,6 +20,7 @@
*/
require_once('Mail/mimeDecode.php');
+require_once('lib/html2text.inc');
// define constants for message compose mode
define('RCUBE_COMPOSE_REPLY', 0x0106);
@@ -296,6 +297,12 @@ function rcmail_compose_header_from($attrib)
{
$a_signatures[$identity_id]['text'] = $sql_arr['signature'];
$a_signatures[$identity_id]['is_html'] = ($sql_arr['html_signature'] == 1) ? true : false;
+ if ($a_signatures[$identity_id]['is_html'])
+ {
+ $h2t = new html2text($a_signatures[$identity_id]['text'], false, false);
+ $plainTextPart = $h2t->get_text();
+ $a_signatures[$identity_id]['plain_text'] = trim($plainTextPart);
+ }
}
// set identity if it's one of the reply-message recipients