<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
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;
*/
class Emailer
{
- /** @var IConfig */
+ /** @var IManageConfigValues */
private $config;
- /** @var IPConfig */
+ /** @var IManagePersonalConfigValues */
private $pConfig;
/** @var LoggerInterface */
private $logger;
/** @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;
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');
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);
+ }
}