From e30ad4e8f63903ed3f308586abf99bf48681fb88 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 2 Dec 2008 23:26:12 -0700 Subject: [PATCH] Fix reply/forwarding formatting. --- imp/lib/Compose.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php index 96a49d3b8..a779aece3 100644 --- a/imp/lib/Compose.php +++ b/imp/lib/Compose.php @@ -1160,7 +1160,7 @@ class IMP_Compose $subject = $h->getValue('subject'); $header['subject'] = empty($subject) ? 'Re: ' - : 'Re: ' . Horde_Imap_Client::getBaseSubject($header['subject'], array('keepblob' => true)); + : 'Re: ' . Horde_Imap_Client::getBaseSubject($subject, array('keepblob' => true)); if (in_array($actionID, array('reply', '*'))) { ($header['to'] = $to) || @@ -1327,7 +1327,7 @@ class IMP_Compose if ($forcebodytxt || $GLOBALS['prefs']->getValue('forward_bodytext')) { $from = Horde_Mime_Address::addrArray2String($h->getOb('from')); - $msg_pre = "\n\n\n----- " . + $msg_pre = "\n----- " . ($from ? sprintf(_("Forwarded message from %s"), $from) : _("Forwarded message")) . " -----\n" . $this->_getMsgHeaders($h) . "\n"; $msg_post = "\n\n----- " . _("End forwarded message") . " -----\n"; @@ -1456,11 +1456,11 @@ class IMP_Compose $tmp[_("Cc")] = $ob; } - $max = max(array_map(array('String', 'length'), $tmp)) + 2; + $max = max(array_map(array('String', 'length'), array_keys($tmp))) + 2; $text = ''; foreach ($tmp as $key => $val) { - $text .= String::pad($key . ': ', $max, ' ', STR_PAD_LEFT); + $text .= String::pad($key . ': ', $max, ' ', STR_PAD_LEFT) . $val . "\n"; } return $text; -- 2.11.0