<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
$this->siteEmailAddress = $this->config->get('config', 'sender_email');
if (empty($this->siteEmailAddress)) {
- $hostname = $this->baseUrl->getHostname();
+ $hostname = $this->baseUrl->getHost();
if (strpos($hostname, ':')) {
$hostname = substr($hostname, 0, strpos($hostname, ':'));
}
$countMessageId += count($value);
}
}
- if ($countMessageId > 0) {
+ if ($countMessageId > 1) {
$this->logger->warning('More than one Message-ID found - RFC violation', ['email' => $email]);
}
// generate a multipart/alternative message header
$messageHeader = $email->getAdditionalMailHeaderString() .
- "From: $fromName <{$fromAddress}>\n" .
- "Reply-To: $fromName <{$replyTo}>\n" .
- "MIME-Version: 1.0\n" .
+ "From: $fromName <{$fromAddress}>\r\n" .
+ "Reply-To: $fromName <{$replyTo}>\r\n" .
+ "MIME-Version: 1.0\r\n" .
"Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
// assemble the final multipart message body with the text and html types included