X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FEmailer.php;h=d7ca234a98da82d7287f344f9bfd4929ba61044d;hb=4b44aca50735dc047e495825bff7dfa717acb615;hp=6a19e8e4587c929b80c0cf1895f187ad5383f033;hpb=854cc3e47296d4a1b01b893376064cf254d84f79;p=friendica.git

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 6a19e8e458..d7ca234a98 100644
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -32,10 +32,16 @@ class Emailer
 	 * @return bool
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function send($params)
+	public static function send(array $params)
 	{
+		$params['sent'] = false;
+
 		Hook::callAll('emailer_send_prepare', $params);
 
+		if ($params['sent']) {
+			return true;
+		}
+
 		$email_textonly = false;
 		if (!empty($params['uid'])) {
 			$email_textonly = PConfig::get($params['uid'], "system", "email_textonly");
@@ -51,7 +57,7 @@ class Emailer
 				.rand(10000, 99999);
 
 		// generate a multipart/alternative message header
-		$messageHeader = defaults($params, 'additionalMailHeader', '') .
+		$messageHeader = ($params['additionalMailHeader'] ?? '') .
 						"From: $fromName <{$params['fromEmail']}>\n" .
 						"Reply-To: $fromName <{$params['replyTo']}>\n" .
 						"MIME-Version: 1.0\n" .
@@ -87,11 +93,16 @@ class Emailer
 			'subject' => $messageSubject,
 			'body' => $multipartMessageBody,
 			'headers' => $messageHeader,
-			'parameters' => $sendmail_params
+			'parameters' => $sendmail_params,
+			'sent' => false,
 		];
 
 		Hook::callAll("emailer_send", $hookdata);
 
+		if ($hookdata['sent']) {
+			return true;
+		}
+
 		$res = mail(
 			$hookdata['to'],
 			$hookdata['subject'],