Page MenuHomePhabricator

D10857.diff
No OneTemporary

D10857.diff

diff --git a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
--- a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
+++ b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
@@ -124,6 +124,31 @@
return $body;
}
+ final public function getRecipientsSummaryHTML(
+ array $to_handles,
+ array $cc_handles) {
+ assert_instances_of($to_handles, 'PhabricatorObjectHandle');
+ assert_instances_of($cc_handles, 'PhabricatorObjectHandle');
+
+ if (PhabricatorEnv::getEnvConfig('metamta.recipients.show-hints')) {
+ $body = array();
+ if ($to_handles) {
+ $body[] = phutil_tag('strong', array(), 'To: ');
+ $body[] = phutil_implode_html(', ', mpull($to_handles, 'getName'));
+ $body[] = phutil_tag('br');
+ }
+ if ($cc_handles) {
+ $body[] = phutil_tag('strong', array(), 'Cc: ');
+ $body[] = phutil_implode_html(', ', mpull($cc_handles, 'getName'));
+ $body[] = phutil_tag('br');
+ }
+ return phutil_tag('div', array(), $body);
+ } else {
+ return '';
+ }
+
+ }
+
final public function multiplexMail(
PhabricatorMetaMTAMail $mail_template,
array $to_handles,
@@ -184,8 +209,11 @@
$body .= "\n";
$body .= $this->getRecipientsSummary($to_handles, $cc_handles);
- foreach ($recipients as $phid => $recipient) {
+ $html_body = $mail_template->getHTMLBody();
+ $html_body .= hsprintf('%s',
+ $this->getRecipientsSummaryHTML($to_handles, $cc_handles));
+ foreach ($recipients as $phid => $recipient) {
$mail = clone $mail_template;
if (isset($to_handles[$phid])) {
@@ -198,6 +226,7 @@
}
$mail->setBody($body);
+ $mail->setHTMLBody($html_body);
$reply_to = null;
if (!$reply_to && $this->supportsPrivateReplies()) {

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 28, 4:28 PM (20 h, 54 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6801357
Default Alt Text
D10857.diff (1 KB)

Event Timeline