From: miqrogroove <miqrogroove@gmail.com>
Date: Tue, 19 Jun 2018 20:23:42 +0000 (-0400)
Subject: Add Missing Fifth Argument to mail() Function Call
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5b8619f501697b95386cd54b0632bd787952fb41;p=friendica.git

Add Missing Fifth Argument to mail() Function Call

This is desperately needed to fix Issue #5190.  In case of any unexpected problem, the admin can use

`$a->config['system']['sendmail_params'] = false;`
---

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 7d35e54417..c58c234df0 100644
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -72,20 +72,28 @@ class Emailer
 		$multipartMessageBody .=
 			"--" . $mimeBoundary . "--\n";					// message ending
 
+		if (Config::get("system", "sendmail_params", true)) {
+			$sendmail_params = '-f ' . $params['fromEmail'];
+		} else {
+			$sendmail_params = null;
+		}
+
 		// send the message
 		$hookdata = [
 			'to' => $params['toEmail'],
 			'subject' => $messageSubject,
 			'body' => $multipartMessageBody,
-			'headers' => $messageHeader
+			'headers' => $messageHeader,
+			'parameters' => $sendmail_params
 		];
 		//echo "<pre>"; var_dump($hookdata); killme();
 		Addon::callHooks("emailer_send", $hookdata);
 		$res = mail(
-			$hookdata['to'],							// send to address
-			$hookdata['subject'],						// subject
-			$hookdata['body'], 	 						// message body
-			$hookdata['headers']						// message headers
+			$hookdata['to'],
+			$hookdata['subject'],
+			$hookdata['body'],
+			$hookdata['headers'],
+			$hookdata['parameters']
 		);
 		logger("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG);
 		logger("return value " . (($res)?"true":"false"), LOGGER_DEBUG);