X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FEmailer.php;h=8116fbf85017d646e03969a87e409aaee96d292c;hb=ec4f53d56f9aa2f82b1cf327a7f0869251fb1dbb;hp=9490b5c31ad1c7f01070b218da44442f72b68fe6;hpb=2b8f0677158feff781478898e1d58e1bb2100c96;p=friendica.git diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php index 9490b5c31a..8116fbf850 100644 --- a/src/Util/Emailer.php +++ b/src/Util/Emailer.php @@ -1,16 +1,36 @@ . + * */ + namespace Friendica\Util; use Friendica\App; use Friendica\Core\Config\IConfig; use Friendica\Core\Hook; +use Friendica\Core\L10n; use Friendica\Core\PConfig\IPConfig; use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Object\EMail\IEmail; use Friendica\Protocol\Email; +use Friendica\Util\EMailer\NotifyMailBuilder; +use Friendica\Util\EMailer\SystemMailBuilder; use Psr\Log\LoggerInterface; /** @@ -26,13 +46,76 @@ class Emailer private $logger; /** @var App\BaseURL */ private $baseUrl; + /** @var L10n */ + private $l10n; + + /** @var string */ + private $siteEmailAddress; + /** @var string */ + private $siteEmailName; - public function __construct(IConfig $config, IPConfig $pConfig, App\BaseURL $baseURL, LoggerInterface $logger) + public function __construct(IConfig $config, IPConfig $pConfig, App\BaseURL $baseURL, LoggerInterface $logger, + L10n $defaultLang) { $this->config = $config; $this->pConfig = $pConfig; $this->logger = $logger; $this->baseUrl = $baseURL; + $this->l10n = $defaultLang; + + $this->siteEmailAddress = $this->config->get('config', 'sender_email'); + if (empty($this->siteEmailAddress)) { + $hostname = $this->baseUrl->getHostname(); + if (strpos($hostname, ':')) { + $hostname = substr($hostname, 0, strpos($hostname, ':')); + } + + $this->siteEmailAddress = 'noreply@' . $hostname; + } + + $this->siteEmailName = $this->config->get('config', 'sitename', 'Friendica Social Network'); + } + + /** + * Gets the site's default sender email address + * + * @return string + */ + public function getSiteEmailAddress() + { + return $this->siteEmailAddress; + } + + /** + * Gets the site's default sender name + * + * @return string + */ + public function getSiteEmailName() + { + return $this->siteEmailName; + } + + /** + * Creates a new system email + * + * @return SystemMailBuilder + */ + public function newSystemMail() + { + return new SystemMailBuilder($this->l10n, $this->baseUrl, $this->config, $this->logger, + $this->getSiteEmailAddress(), $this->getSiteEmailName()); + } + + /** + * Creates a new mail for notifications + * + * @return NotifyMailBuilder + */ + public function newNotifyMail() + { + return new NotifyMailBuilder($this->l10n, $this->baseUrl, $this->config, $this->logger, + $this->getSiteEmailAddress(), $this->getSiteEmailName()); } /** @@ -45,21 +128,30 @@ class Emailer */ public function send(IEmail $email) { - $params['sent'] = false; - - Hook::callAll('emailer_send_prepare', $params); + Hook::callAll('emailer_send_prepare', $email); - if ($params['sent']) { + if (empty($email)) { 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'); } $fromName = Email::encodeHeader(html_entity_decode($email->getFromName(), ENT_QUOTES, 'UTF-8'), 'UTF-8'); - $fromEmail = $email->getFromEmail(); + $fromAddress = $email->getFromAddress(); $replyTo = $email->getReplyTo(); $messageSubject = Email::encodeHeader(html_entity_decode($email->getSubject(), ENT_QUOTES, 'UTF-8'), 'UTF-8'); @@ -70,15 +162,15 @@ class Emailer . rand(10000, 99999); // generate a multipart/alternative message header - $messageHeader = $email->getAdditionalMailHeader() . - "From: $fromName <{$fromEmail}>\n" . + $messageHeader = $email->getAdditionalMailHeaderString() . + "From: $fromName <{$fromAddress}>\n" . "Reply-To: $fromName <{$replyTo}>\n" . "MIME-Version: 1.0\n" . "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; // assemble the final multipart message body with the text and html types included - $textBody = chunk_split(base64_encode($email->getMessage())); - $htmlBody = chunk_split(base64_encode($email->getMessage(true))); + $textBody = chunk_split(base64_encode($email->getMessage(true))); + $htmlBody = chunk_split(base64_encode($email->getMessage())); $multipartMessageBody = "--" . $mimeBoundary . "\n" . // plain text section "Content-Type: text/plain; charset=UTF-8\n" . "Content-Transfer-Encoding: base64\n\n" . @@ -95,14 +187,14 @@ class Emailer "--" . $mimeBoundary . "--\n"; // message ending if ($this->config->get('system', 'sendmail_params', true)) { - $sendmail_params = '-f ' . $fromEmail; + $sendmail_params = '-f ' . $fromAddress; } else { $sendmail_params = null; } // send the message $hookdata = [ - 'to' => $email->getToEmail(), + 'to' => $email->getToAddress(), 'subject' => $messageSubject, 'body' => $multipartMessageBody, 'headers' => $messageHeader, @@ -116,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->getToEmail() . '\n' . $messageHeader); + + $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); + } }