bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'chriscase-master'

Browse source 
Conflicts:
	mod/dfrn_notify.php
This commit is contained in:
Friendika 2011-02-20 01:42:11 -08:00
commit af0fe4cf42
2 changed files with 72 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
include/EmailNotification.php Normal file
View file

@ -0,0 +1,61 @@
<?php
class EmailNotification {
/**
* Send a multipart/alternative message with Text and HTML versions
*
* @param fromName name of the sender
* @param fromEmail email fo the sender
* @param replyTo replyTo address to direct responses
* @param toEmail destination email address
* @param messageSubject subject of the message
* @param htmlVersion html version of the message
* @param textVersion text only version of the message
*/
static public function sendTextHtmlEmail($fromName,$fromEmail,$replyTo,$toEmail,$messageSubject,$htmlVersion,$textVersion) {
logger("sendTextHtmlEmail: BEGIN");
logger("fromName: " . $fromName);
logger("fromEmail: " . $fromEmail);
logger("replyTo: " . $replyTo);
logger("toEmail: " . $toEmail);
logger("messageSubject: " . $messageSubject);
//logger("htmlVersion: " . $htmlVersion);
//logger("textVersion: " . $textVersion);
// generate a mime boundary
$mimeBoundary =rand(0,9)."-"
.rand(10000000000,9999999999)."-"
.rand(10000000000,9999999999)."=:"
.rand(10000,99999);
// generate a multipart/alternative message header
$messageHeader =
"From: {$fromName} <{$fromEmail}>\n" .
"Reply-To: {$replyTo}\n" .
"MIME-Version: 1.0\n" .
"Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
// assemble the final multipart message body with the text and html types included
$textBody = chunk_split(base64_encode($textVersion));
$htmlBody = chunk_split(base64_encode($htmlVersion));
$multipartMessageBody =
"--" . $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" .
"--" . $mimeBoundary . "--\n"; // message ending
// send the message
$res = mail(
$toEmail, // send to address
$messageSubject, // subject
$multipartMessageBody, // message body
$messageHeader // message headers
);
logger("sendTextHtmlEmail: END");
}
}
?>

45
mod/dfrn_notify.php
View file

@ -173,22 +173,10 @@ function dfrn_notify_post(&$a) {
require_once('bbcode.php'); require_once('bbcode.php');
if($importer['notify-flags'] & NOTIFY_MAIL) { if($importer['notify-flags'] & NOTIFY_MAIL) {
// generate a mime boundary
$msg['mimeboundary'] =rand(0,9)."-"
.rand(10000000000,9999999999)."-"
.rand(10000000000,9999999999)."=:"
.rand(10000,99999);
// name of the automated email sender // name of the automated email sender
$msg['notificationfromname'] = t('Administrator'); $msg['notificationfromname'] = t('Administrator');
// noreply address to send from // noreply address to send from
$msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname(); $msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname();
// message headers
$msg['headers'] =
"From: {$msg['notificationfromname']} <{$msg['notificationfromemail']}>\n" .
"Reply-To: {$msg['notificationfromemail']}\n" .
"MIME-Version: 1.0\n" .
"Content-Type: multipart/alternative; boundary=\"{$msg['mimeboundary']}\"";
// text version // text version
// process the message body to display properly in text mode // process the message body to display properly in text mode
@ -208,7 +196,7 @@ function dfrn_notify_post(&$a) {
// 4) decode any encoded html tags // 4) decode any encoded html tags
$msg['htmlversion'] $msg['htmlversion']
= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$msg['body'])))); = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$msg['body']))));
// load the template for private message notifications // load the template for private message notifications
$tpl = load_view_file('view/mail_received_html_body_eml.tpl'); $tpl = load_view_file('view/mail_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array( $email_html_body_tpl = replace_macros($tpl,array(
@ -239,27 +227,16 @@ function dfrn_notify_post(&$a) {
'$hostname' => $a->get_hostname() // name of this host '$hostname' => $a->get_hostname() // name of this host
)); ));
// assemble the final multipart message body with the text and html types included // use the EmailNotification library to send the message
$textbody = chunk_split(base64_encode($email_text_body_tpl)); require_once("include/EmailNotification.php");
$htmlbody = chunk_split(base64_encode($email_html_body_tpl)); EmailNotification::sendTextHtmlEmail(
$multipart_message_body = $msg['notificationfromname'],
"--" . $msg['mimeboundary'] . "\n" . // plain text section $msg['notificationfromemail'],
"Content-Type: text/plain; charset=UTF-8\n" . $msg['notificationfromemail'],
"Content-Transfer-Encoding: base64\n\n" . $importer['email'],
$textbody . "\n" . t('New mail received at ') . $a->config['sitename'],
"--" . $msg['mimeboundary'] . "\n" . // text/html section $email_html_body_tpl,
"Content-Type: text/html; charset=UTF-8\n" . $email_text_body_tpl
"Content-Transfer-Encoding: base64\n\n" .
$htmlbody . "\n" .
"--" . $msg['mimeboundary'] . "--\n"; // message ending
// send the message
$res = mail(
$importer['email'], // send to address
t('New mail received at ') . $a->config['sitename'], // subject
$multipart_message_body, // message body
$msg['headers'] // message headers
); );
} }
xml_status(0); xml_status(0);