Page MenuHomePhabricator
Files F15427212

D18994.id45559.diff
No OneTemporary
Actions

D18994.id45559.diff
View Options

diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
--- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -153,9 +153,9 @@
$adapter_doc_name));
$placeholder_description = $this->deformat(pht(<<<EODOC
-When sending a message that has no To recipient (i.e. all recipients are CC'd,
-for example when multiplexing mail), set the To field to the following value. If
-no value is set, messages with no To will have their CCs upgraded to To.
+When sending a message that has no To recipient (i.e. all recipients are CC'd),
+set the To field to the following value. If no value is set, messages with no
+To will have their CCs upgraded to To.
EODOC
));
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
@@ -19,8 +19,8 @@
$this->mailer->Encoding = $encoding;
// By default, PHPMailer sends one mail per recipient. We handle
- // multiplexing higher in the stack, so tell it to send mail exactly
- // like we ask.
+ // combining or separating To and Cc higher in the stack, so tell it to
+ // send mail exactly like we ask.
$this->mailer->SingleTo = false;
$mailer = PhabricatorEnv::getEnvConfig('phpmailer.mailer');
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
@@ -22,8 +22,8 @@
$this->mailer->Encoding = $encoding;
// By default, PHPMailerLite sends one mail per recipient. We handle
- // multiplexing higher in the stack, so tell it to send mail exactly
- // like we ask.
+ // combining or separating To and Cc higher in the stack, so tell it to
+ // send mail exactly like we ask.
$this->mailer->SingleTo = false;
}
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -507,8 +507,8 @@
$add_cc = array();
$add_to = array();
- // If multiplexing is enabled, some recipients will be in "Cc"
- // rather than "To". We'll move them to "To" later (or supply a
+ // If we're sending one mail to everyone, some recipients will be in
+ // "Cc" rather than "To". We'll move them to "To" later (or supply a
// dummy "To") but need to look for the recipient in either the
// "To" or "Cc" fields here.
$target_phid = head(idx($params, 'to', array()));
@@ -847,7 +847,7 @@
return base64_encode($base);
}
- public static function shouldMultiplexAllMail() {
+ public static function shouldMailEachRecipient() {
return PhabricatorEnv::getEnvConfig('metamta.one-mail-per-recipient');
}
@@ -1290,7 +1290,7 @@
private function loadPreferences($target_phid) {
$viewer = PhabricatorUser::getOmnipotentUser();
- if (self::shouldMultiplexAllMail()) {
+ if (self::shouldMailEachRecipient()) {
$preferences = id(new PhabricatorUserPreferencesQuery())
->setViewer($viewer)
->withUserPHIDs(array($target_phid))
diff --git a/src/applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php
@@ -14,7 +14,7 @@
}
public function isUserPanel() {
- return PhabricatorMetaMTAMail::shouldMultiplexAllMail();
+ return PhabricatorMetaMTAMail::shouldMailEachRecipient();
}
public function isManagementPanel() {

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 24, 1:20 PM (3 w, 19 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7393531
Default Alt Text
D18994.id45559.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility