<?php
/**
- * @file src/Util/Emailer.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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\Hook;
use Friendica\Core\L10n;
use Friendica\Core\PConfig\IPConfig;
-use Friendica\Model\Notify;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Object\EMail\IEmail;
use Friendica\Protocol\Email;
$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, ':'));
/**
* Creates a new mail for notifications
*
- * @see Notify
- *
* @return NotifyMailBuilder
*/
public function newNotifyMail()
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');
. 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" .
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);
+ }
}