View Options

	diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
	index 3ca6366730..ae134a29b8 100644
	--- a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
	+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
	@@ -1,162 +1,162 @@
	<?php

	final class PhabricatorMailImplementationPHPMailerAdapter
	extends PhabricatorMailImplementationAdapter {

	const ADAPTERTYPE = 'smtp';

	private $mailer;

	protected function validateOptions(array $options) {
	PhutilTypeSpec::checkMap(
	$options,
	array(
	'host' => 'string\|null',
	'port' => 'int',
	'user' => 'string\|null',
	'password' => 'string\|null',
	'protocol' => 'string\|null',
	'encoding' => 'string',
	'mailer' => 'string',
	));
	}

	public function newDefaultOptions() {
	return array(
	'host' => null,
	'port' => 25,
	'user' => null,
	'password' => null,
	'protocol' => null,
	'encoding' => 'base64',
	'mailer' => 'smtp',
	);
	}

	public function newLegacyOptions() {
	return array(
	'host' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-host'),
	'port' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-port'),
	'user' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-user'),
	- 'password' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-passsword'),
	+ 'password' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-password'),
	'protocol' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-protocol'),
	'encoding' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-encoding'),
	'mailer' => PhabricatorEnv::getEnvConfig('phpmailer.mailer'),
	);
	}

	/**
	* @phutil-external-symbol class PHPMailer
	*/
	public function prepareForSend() {
	$root = phutil_get_library_root('phabricator');
	$root = dirname($root);
	require_once $root.'/externals/phpmailer/class.phpmailer.php';
	$this->mailer = new PHPMailer($use_exceptions = true);
	$this->mailer->CharSet = 'utf-8';

	$encoding = $this->getOption('encoding');
	$this->mailer->Encoding = $encoding;

	// By default, PHPMailer sends one mail per recipient. We handle
	// 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 = $this->getOption('mailer');
	if ($mailer == 'smtp') {
	$this->mailer->IsSMTP();
	$this->mailer->Host = $this->getOption('host');
	$this->mailer->Port = $this->getOption('port');
	$user = $this->getOption('user');
	if ($user) {
	$this->mailer->SMTPAuth = true;
	$this->mailer->Username = $user;
	$this->mailer->Password = $this->getOption('password');
	}

	$protocol = $this->getOption('protocol');
	if ($protocol) {
	$protocol = phutil_utf8_strtolower($protocol);
	$this->mailer->SMTPSecure = $protocol;
	}
	} else if ($mailer == 'sendmail') {
	$this->mailer->IsSendmail();
	} else {
	// Do nothing, by default PHPMailer send message using PHP mail()
	// function.
	}
	}

	public function supportsMessageIDHeader() {
	return true;
	}

	public function setFrom($email, $name = '') {
	$this->mailer->SetFrom($email, $name, $crazy_side_effects = false);
	return $this;
	}

	public function addReplyTo($email, $name = '') {
	$this->mailer->AddReplyTo($email, $name);
	return $this;
	}

	public function addTos(array $emails) {
	foreach ($emails as $email) {
	$this->mailer->AddAddress($email);
	}
	return $this;
	}

	public function addCCs(array $emails) {
	foreach ($emails as $email) {
	$this->mailer->AddCC($email);
	}
	return $this;
	}

	public function addAttachment($data, $filename, $mimetype) {
	$this->mailer->AddStringAttachment(
	$data,
	$filename,
	'base64',
	$mimetype);
	return $this;
	}

	public function addHeader($header_name, $header_value) {
	if (strtolower($header_name) == 'message-id') {
	$this->mailer->MessageID = $header_value;
	} else {
	$this->mailer->AddCustomHeader($header_name.': '.$header_value);
	}
	return $this;
	}

	public function setBody($body) {
	$this->mailer->IsHTML(false);
	$this->mailer->Body = $body;
	return $this;
	}

	public function setHTMLBody($html_body) {
	$this->mailer->IsHTML(true);
	$this->mailer->Body = $html_body;
	return $this;
	}

	public function setSubject($subject) {
	$this->mailer->Subject = $subject;
	return $this;
	}

	public function hasValidRecipients() {
	return true;
	}

	public function send() {
	return $this->mailer->Send();
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 13:46 (3 w, 3 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1125205
Default Alt Text: (4 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions