X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FEmailer.php;h=6a19e8e4587c929b80c0cf1895f187ad5383f033;hb=5c50684b5047e259517d67372658ca86976839df;hp=ec37204000b3b8d0a42f5275037006cb40dfc674;hpb=e90b0748aaa879bc5dfbffb12083c26f1d377342;p=friendica.git diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php index ec37204000..6a19e8e458 100644 --- a/src/Util/Emailer.php +++ b/src/Util/Emailer.php @@ -4,6 +4,9 @@ */ namespace Friendica\Util; +use Friendica\Core\Config; +use Friendica\Core\Hook; +use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Protocol\Email; @@ -16,29 +19,30 @@ class Emailer * Send a multipart/alternative message with Text and HTML versions * * @param array $params parameters - * fromName name of the sender - * fromEmail email fo the sender - * replyTo replyTo address to direct responses - * toEmail destination email address - * messageSubject subject of the message - * htmlVersion html version of the message - * textVersion text only version of the message - * additionalMailHeader additions to the smtp mail header + * fromName name of the sender + * fromEmail email of the sender + * replyTo address to direct responses + * toEmail destination email address + * messageSubject subject of the message + * htmlVersion html version of the message + * textVersion text only version of the message + * additionalMailHeader additions to the SMTP mail header * optional uid user id of the destination user * - * @return object + * @return bool + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function send($params) { - call_hooks('emailer_send_prepare', $params); + Hook::callAll('emailer_send_prepare', $params); $email_textonly = false; - if (x($params, "uid")) { + if (!empty($params['uid'])) { $email_textonly = PConfig::get($params['uid'], "system", "email_textonly"); } - $fromName = Email::emailHeaderEncode(html_entity_decode($params['fromName'], ENT_QUOTES, 'UTF-8'), 'UTF-8'); - $messageSubject = Email::emailHeaderEncode(html_entity_decode($params['messageSubject'], ENT_QUOTES, 'UTF-8'), 'UTF-8'); + $fromName = Email::encodeHeader(html_entity_decode($params['fromName'], ENT_QUOTES, 'UTF-8'), 'UTF-8'); + $messageSubject = Email::encodeHeader(html_entity_decode($params['messageSubject'], ENT_QUOTES, 'UTF-8'), 'UTF-8'); // generate a mime boundary $mimeBoundary =rand(0, 9)."-" @@ -47,7 +51,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,23 +75,32 @@ 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 = array( + $hookdata = [ 'to' => $params['toEmail'], 'subject' => $messageSubject, 'body' => $multipartMessageBody, - 'headers' => $messageHeader - ); - //echo "
"; var_dump($hookdata); killme(); - call_hooks("emailer_send", $hookdata); + 'headers' => $messageHeader, + 'parameters' => $sendmail_params + ]; + + Hook::callAll("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); + Logger::log("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, Logger::DEBUG); + Logger::log("return value " . (($res)?"true":"false"), Logger::DEBUG); return $res; } }