X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FUtil%2FEmailer.php;h=1341aaf33e42b0de3fd933b3767a04ff4dac4564;hb=0b4aa019fd70249a433eed7d0e7e2a86df4ec930;hp=1717b994a41a380f4f7c77cc4c77b6f817285ef5;hpb=34dce9fd7620ff878d2ad7ec3407430e9be5045c;p=friendica.git

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 1717b994a4..1341aaf33e 100644
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -1,15 +1,31 @@
 <?php
 /**
- * @file src/Util/Emailer.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 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\Model\Notify;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Object\EMail\IEmail;
 use Friendica\Protocol\Email;
@@ -22,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;
@@ -38,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;
@@ -48,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, ':'));
@@ -94,15 +110,11 @@ class Emailer
 	/**
 	 * Creates a new mail for notifications
 	 *
-	 * @see Notify
-	 *
-	 * @param L10n $l10n The chosen language for the new email
-	 *
 	 * @return NotifyMailBuilder
 	 */
-	public function newNotifyMail(L10n $l10n)
+	public function newNotifyMail()
 	{
-		return new NotifyMailBuilder($l10n, $this->baseUrl, $this->config,
+		return new NotifyMailBuilder($this->l10n, $this->baseUrl, $this->config, $this->logger,
 			$this->getSiteEmailAddress(), $this->getSiteEmailName());
 	}
 
@@ -122,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');
@@ -139,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" .
@@ -185,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);
+	}
 }