From a2dee48ba5e3c12d9e84ce29072be1975c511b8a Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Sun, 22 Feb 2009 22:31:31 -0700 Subject: [PATCH] Use new Horde_Text_Flowed pacakage --- imp/lib/Compose.php | 9 +++------ imp/lib/Message.php | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php index 48c2d2ee8..f257ef745 100644 --- a/imp/lib/Compose.php +++ b/imp/lib/Compose.php @@ -946,8 +946,7 @@ class IMP_Compose $textBody->setDisposition('inline'); /* Send in flowed format. */ - require_once 'Text/Flowed.php'; - $flowed = new Text_Flowed($body, $charset); + $flowed = new Horde_Text_Flowed($body, $charset); $flowed->setDelSp(true); $textBody->setContentTypeParameter('format', 'flowed'); $textBody->setContentTypeParameter('DelSp', 'Yes'); @@ -2222,8 +2221,7 @@ class IMP_Compose } if ($part->getContentTypeParameter('format') == 'flowed') { - require_once 'Text/Flowed.php'; - $flowed = new Text_Flowed($msg); + $flowed = new Horde_Text_Flowed($msg); if (String::lower($part->getContentTypeParameter('delsp')) == 'yes') { $flowed->setDelSp(true); } @@ -2236,8 +2234,7 @@ class IMP_Compose } if (!empty($options['toflowed'])) { - require_once 'Text/Flowed.php'; - $flowed = new Text_Flowed($msg); + $flowed = new Horde_Text_Flowed($msg); $msg = $flowed->toFlowed(true); } } diff --git a/imp/lib/Message.php b/imp/lib/Message.php index b02bc2034..08769a37f 100644 --- a/imp/lib/Message.php +++ b/imp/lib/Message.php @@ -318,7 +318,7 @@ class IMP_Message $body = $body_part->getContents(); /* Re-flow the message for prettier formatting. */ - $flowed = new Text_Flowed($mime_message->replaceEOL($body, "\n")); + $flowed = new Horde_Text_Flowed($mime_message->replaceEOL($body, "\n")); if ($mime_message->getContentTypeParameter('delsp') == 'yes') { $flowed->setDelSp(true); } -- 2.11.0