X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FEmailer.php;h=1dd513c42fe3f1c10b19b390508ff60edec95858;hb=dc49ad090eca1bf4e511091418166da6fe68009b;hp=ba65296f507a2f3faaacf00ee6484cc94233c458;hpb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;p=friendica.git diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php index ba65296f50..1dd513c42f 100644 --- a/src/Util/Emailer.php +++ b/src/Util/Emailer.php @@ -4,6 +4,8 @@ */ namespace Friendica\Util; +use Friendica\Core\Addon; +use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Protocol\Email; @@ -30,7 +32,7 @@ class Emailer */ public static function send($params) { - call_hooks('emailer_send_prepare', $params); + Addon::callHooks('emailer_send_prepare', $params); $email_textonly = false; if (x($params, "uid")) { @@ -47,7 +49,7 @@ class Emailer .rand(10000, 99999); // generate a multipart/alternative message header - $messageHeader = $params['additionalMailHeader'] . + $messageHeader = defaults($params, 'additionalMailHeader', '') . "From: $fromName <{$params['fromEmail']}>\n" . "Reply-To: $fromName <{$params['replyTo']}>\n" . "MIME-Version: 1.0\n" . @@ -71,20 +73,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 "
"; var_dump($hookdata); killme(); - call_hooks("emailer_send", $hookdata); + 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);