From 795ff6a9ac503752280f5cc43bb01827e10438ab Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 10 Nov 2008 11:59:43 -0700 Subject: [PATCH] Remove remaining IMP_Headers references. --- imp/lib/Compose.php | 27 ++++++++++++++------------- imp/lib/Spam.php | 2 +- imp/lib/UI/Compose.php | 3 +-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php index 5e6f8c43e..565ff0054 100644 --- a/imp/lib/Compose.php +++ b/imp/lib/Compose.php @@ -843,13 +843,14 @@ class IMP_Compose /** * Sends a message. * - * @param string $email The e-mail list to send to. - * @param IMP_Headers &$headers The IMP_Headers object holding this - * message's headers. - * @param mixed &$message Either the message text (string) or a - * Horde_Mime_Message object that contains - * the text to send. - * @param string $charset The charset that was used for the headers. + * @param string $email The e-mail list to send to. + * @param Horde_Mime_Headers &$headers The object holding this + * message's headers. + * @param mixed &$message Either the message text (string) + * or a Horde_Mime_Message object + * that contains the text to send. + * @param string $charset The charset that was used for the + * headers. * * @return mixed True on success, PEAR_Error on error. */ @@ -1647,7 +1648,7 @@ class IMP_Compose /** * Get "tieto" identity information. * - * @param IMP_Headers $h The headers object for the message. + * @param Horde_Mime_Headers $h The headers object for the message. * * @return mixed See Identity_imp::getMatchingIdentity(). */ @@ -1744,7 +1745,7 @@ class IMP_Compose /** * Determine the header information to display in the forward/reply. * - * @param IMP_Headers &$h The IMP_Headers object for the message. + * @param Horde_Mime_Headers &$h The headers object for the message. * * @return string The header information for the original message. */ @@ -2098,10 +2099,10 @@ class IMP_Compose /** * Expand macros in attribution text when replying to messages. * - * @param string $line The line of attribution text. - * @param string $from The email address of the original - * sender. - * @param IMP_Headers &$h The IMP_Headers object for the message. + * @param string $line The line of attribution text. + * @param string $from The email address of the original + * sender. + * @param Horde_Mime_Headers &$h The headers object for the message. * * @return string The attribution text. */ diff --git a/imp/lib/Spam.php b/imp/lib/Spam.php index d879afda9..76fae0493 100644 --- a/imp/lib/Spam.php +++ b/imp/lib/Spam.php @@ -254,7 +254,7 @@ class IMP_Spam { $mime->setType('multipart/digest'); $mime->addPart(new Horde_Mime_Part('message/rfc822', $data)); - $spam_headers = new IMP_Headers(); + $spam_headers = new Horde_Mime_Headers(); $spam_headers->addMessageIdHeader(); $spam_headers->addHeader('Date', date('r')); $spam_headers->addHeader('To', $GLOBALS['conf'][$action]['email']); diff --git a/imp/lib/UI/Compose.php b/imp/lib/UI/Compose.php index 37726e367..8ca7779cc 100644 --- a/imp/lib/UI/Compose.php +++ b/imp/lib/UI/Compose.php @@ -63,9 +63,8 @@ class IMP_UI_Compose { require_once IMP_BASE . '/lib/MIME/Headers.php'; $imp_imap = &IMP_IMAP::singleton(); $imp_imap->changeMbox($contents->getMessageMailbox(), IMP_IMAP_AUTO); - $headers = new IMP_Headers($contents->getMessageIndex()); - $headers->buildHeaders(false); + $headers = $contents->getHeaderOb(); $headers->addResentHeaders($from_addr, $recip['header']['to']); $mime_message = $contents->getMIMEMessage(); -- 2.11.0