X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2FEmailer.php;h=9df6ac36c9dab238b3b2d61eb17ddb9b4eef3474;hb=0541a62134e8af948f0e4c713a42ca70eaa64f3f;hp=f61636d959ccf72c0205ffa3534934a5e28d84e3;hpb=a659b3411733c9fc5017568684d24d97b19ebcc3;p=friendica.git diff --git a/include/Emailer.php b/include/Emailer.php index f61636d959..9df6ac36c9 100644 --- a/include/Emailer.php +++ b/include/Emailer.php @@ -14,18 +14,24 @@ class Emailer { * @param htmlVersion html version of the message * @param textVersion text only version of the message * @param additionalMailHeader additions to the smtp mail header + * @param optional uid user id of the destination user */ static public function send($params) { call_hooks('emailer_send_prepare', $params); + $email_textonly = False; + if (x($params,"uid")) { + $email_textonly = get_pconfig($params['uid'], "system", "email_textonly"); + } + $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8'); $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8'); // generate a mime boundary $mimeBoundary =rand(0,9)."-" - .rand(10000000000,9999999999)."-" - .rand(10000000000,9999999999)."=:" + .rand(100000000,999999999)."-" + .rand(100000000,999999999)."=:" .rand(10000,99999); // generate a multipart/alternative message header @@ -43,11 +49,16 @@ class Emailer { "--" . $mimeBoundary . "\n" . // plain text section "Content-Type: text/plain; charset=UTF-8\n" . "Content-Transfer-Encoding: base64\n\n" . - $textBody . "\n" . - "--" . $mimeBoundary . "\n" . // text/html section - "Content-Type: text/html; charset=UTF-8\n" . - "Content-Transfer-Encoding: base64\n\n" . - $htmlBody . "\n" . + $textBody . "\n"; + + if (!$email_textonly && !is_null($params['htmlVersion'])){ + $multipartMessageBody .= + "--" . $mimeBoundary . "\n" . // text/html section + "Content-Type: text/html; charset=UTF-8\n" . + "Content-Transfer-Encoding: base64\n\n" . + $htmlBody . "\n"; + } + $multipartMessageBody .= "--" . $mimeBoundary . "--\n"; // message ending // send the message @@ -57,16 +68,16 @@ class Emailer { 'body' => $multipartMessageBody, 'headers' => $messageHeader ); + //echo "
"; var_dump($hookdata); killme(); call_hooks("emailer_send", $hookdata); $res = mail( $hookdata['to'], // send to address $hookdata['subject'], // subject $hookdata['body'], // message body - $hookdata['headers'], // message headers + $hookdata['headers'] // message headers ); logger("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG); logger("return value " . (($res)?"true":"false"), LOGGER_DEBUG); return $res; } } -?>