From a23884b3d250b9853ce45c2cbb737df6d86895bb Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 13 May 2007 14:25:52 -0400
Subject: [PATCH] Wrap message body text (closes #1484148)
---
CHANGELOG | 1 +
program/steps/mail/sendmail.inc | 18 +++++++++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 66dab0e..1a2d5e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
- Updated Norwegian (bokmal), Czech, Danish and Portuguese (standard) translation
- Fixed marking as read in preview pane (closes #1484364)
- CSS hack to display attachments correctly in IE6
+- Wrap message body text (closes #1484148)
2007/05/03 (yllar)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index bc454b3..37b57e2 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -258,7 +258,7 @@
// add a plain text version of the e-mail as an alternative part.
$h2t = new html2text($message_body);
- $plainTextPart = $h2t->get_text();
+ $plainTextPart = wordwrap($h2t->get_text(), 998, "\r\n", true);
$MAIL_MIME->setTXTBody($plainTextPart);
// look for "emoticon" images from TinyMCE and copy into message as attachments
@@ -266,6 +266,8 @@
}
else
{
+ $message_body = wordwrap($message_body, 75, "\r\n");
+ $message_body = wordwrap($message_body, 998, "\r\n", true);
$MAIL_MIME->setTXTBody($message_body, FALSE, TRUE);
}
@@ -286,12 +288,14 @@
$transfer_encoding = in_array(strtoupper($message_charset), $charset_7bit) ? '7bit' : '8bit';
// encoding settings for mail composing
-$message_param = array('text_encoding' => $transfer_encoding,
- 'html_encoding' => 'quoted-printable',
- 'head_encoding' => 'quoted-printable',
- 'head_charset' => $message_charset,
- 'html_charset' => $message_charset,
- 'text_charset' => $message_charset);
+$message_param = array(
+ 'text_encoding' => $transfer_encoding,
+ 'html_encoding' => 'quoted-printable',
+ 'head_encoding' => 'quoted-printable',
+ 'head_charset' => $message_charset,
+ 'html_charset' => $message_charset,
+ 'text_charset' => $message_charset,
+);
// compose message body and get headers
$msg_body = $MAIL_MIME->get($message_param);
--
Gitblit v1.9.1