Changeset 556 in subversion

Timestamp:

May 13, 2007 2:25:52 PM (6 years ago)

Author:

thomasb

Message:

Wrap message body text (closes #1484148)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/sendmail.inc (modified) (3 diffs)

trunk/roundcubemail/CHANGELOG

@@ -7 +7 @@
 - Fixed marking as read in preview pane (closes #1484364)
 - CSS hack to display attachments correctly in IE6
+- Wrap message body text (closes #1484148)
 
 

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -259 +259 @@
   // 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);
 
@@ -267 +267 @@
 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);
   }
@@ -287 +289 @@
 
 // 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