X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FEmailer.php;h=1341aaf33e42b0de3fd933b3767a04ff4dac4564;hb=720a43461d67ab229de0aecfc5008f22cc4c1c54;hp=e5f1269ab5db6b11ce8db25320958abf73ed5e32;hpb=1595cf413d9250cf65f5276d03ed7bc48aea0ec5;p=friendica.git diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php index e5f1269ab5..1341aaf33e 100644 --- a/src/Util/Emailer.php +++ b/src/Util/Emailer.php @@ -1,14 +1,31 @@ . + * */ + namespace Friendica\Util; use Friendica\App; -use Friendica\Core\Config\IConfig; +use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig\IPConfig; +use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Object\EMail\IEmail; use Friendica\Protocol\Email; @@ -21,9 +38,9 @@ use Psr\Log\LoggerInterface; */ class Emailer { - /** @var IConfig */ + /** @var IManageConfigValues */ private $config; - /** @var IPConfig */ + /** @var IManagePersonalConfigValues */ private $pConfig; /** @var LoggerInterface */ private $logger; @@ -37,7 +54,7 @@ class Emailer /** @var string */ private $siteEmailName; - public function __construct(IConfig $config, IPConfig $pConfig, App\BaseURL $baseURL, LoggerInterface $logger, + public function __construct(IManageConfigValues $config, IManagePersonalConfigValues $pConfig, App\BaseURL $baseURL, LoggerInterface $logger, L10n $defaultLang) { $this->config = $config; @@ -47,7 +64,7 @@ class Emailer $this->l10n = $defaultLang; $this->siteEmailAddress = $this->config->get('config', 'sender_email'); - if (empty($sysEmailAddress)) { + if (empty($this->siteEmailAddress)) { $hostname = $this->baseUrl->getHostname(); if (strpos($hostname, ':')) { $hostname = substr($hostname, 0, strpos($hostname, ':')); @@ -117,6 +134,17 @@ class Emailer return true; } + // @see https://github.com/friendica/friendica/issues/9142 + $countMessageId = 0; + foreach ($email->getAdditionalMailHeader() as $name => $value) { + if (strtolower($name) == 'message-id') { + $countMessageId += count($value); + } + } + if ($countMessageId > 0) { + $this->logger->warning('More than one Message-ID found - RFC violation', ['email' => $email]); + } + $email_textonly = false; if (!empty($email->getRecipientUid())) { $email_textonly = $this->pConfig->get($email->getRecipientUid(), 'system', 'email_textonly'); @@ -134,7 +162,7 @@ class Emailer . rand(10000, 99999); // generate a multipart/alternative message header - $messageHeader = $email->getAdditionalMailHeader() . + $messageHeader = $email->getAdditionalMailHeaderString() . "From: $fromName <{$fromAddress}>\n" . "Reply-To: $fromName <{$replyTo}>\n" . "MIME-Version: 1.0\n" . @@ -180,15 +208,34 @@ class Emailer return true; } - $res = mail( + $res = $this->mail( $hookdata['to'], $hookdata['subject'], $hookdata['body'], $hookdata['headers'], $hookdata['parameters'] ); + $this->logger->debug('header ' . 'To: ' . $email->getToAddress() . '\n' . $messageHeader); $this->logger->debug('return value ' . (($res) ? 'true' : 'false')); + return $res; } + + /** + * Wrapper around the mail() method (mainly used to overwrite for tests) + * @see mail() + * + * @param string $to Recipient of this mail + * @param string $subject Subject of this mail + * @param string $body Message body of this mail + * @param string $headers Headers of this mail + * @param string $parameters Additional (sendmail) parameters of this mail + * + * @return boolean true if the mail was successfully accepted for delivery, false otherwise. + */ + protected function mail(string $to, string $subject, string $body, string $headers, string $parameters) + { + return mail($to, $subject, $body, $headers, $parameters); + } }