jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed error which was causing multiple line breaks, added comments to better document what is occuring, cleaned up code, removed unnecessary parameters from templating step

Browse source
This commit is contained in:
Chris Case 2011-02-15 03:31:20 -08:00
parent 7b26500510
commit 0d853433eb
1 changed files with 41 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
mod/dfrn_notify.php
View file

@ -173,63 +173,70 @@ 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) {
// $body = html_entity_decode(strip_tags(bbcode(stripslashes(nl2br($msg['body'])))),ENT_QUOTES,'UTF-8'); // generate a mime boundary
// $body = strip_tags(bbcode(stripslashes(nl2br($msg['body']))));
/*if(function_exists('quoted_printable_encode'))
$body = quoted_printable_encode($body);
else
$body = qp($body);*/
//$msg['body'] = str_replace(array("\\r\\n", "\\r", "\\n"), "<br />", $msg['body']);
//$msg['body'] = html_entity_decode(strip_tags(bbcode($msg['body'])));
$msg['mimeboundary'] =rand(0,9)."-" $msg['mimeboundary'] =rand(0,9)."-"
.rand(10000000000,9999999999)."-" .rand(10000000000,9999999999)."-"
.rand(10000000000,9999999999)."=:" .rand(10000000000,9999999999)."=:"
.rand(10000,99999); .rand(10000,99999);
// name of the automated email sender
$msg['notificationfromname'] = t('Administrator'); $msg['notificationfromname'] = t('Administrator');
// noreply address to send from
$msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname(); $msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname();
// message headers
$msg['headers'] = $msg['headers'] =
"From: {$msg['notificationfromname']} <{$msg['notificationfromemail']}>\n" . "From: {$msg['notificationfromname']} <{$msg['notificationfromemail']}>\n" .
"Reply-To: {$msg['notificationfromemail']}\n" . "Reply-To: {$msg['notificationfromemail']}\n" .
"MIME-Version: 1.0\n" . "MIME-Version: 1.0\n" .
"Content-Type: multipart/alternative; boundary=\"{$msg['mimeboundary']}\""; "Content-Type: multipart/alternative; boundary=\"{$msg['mimeboundary']}\"";
// text version
// process the message body to display properly in text mode
// 1) substitute a \n character for the "\" then "n", so it behaves properly (it doesn't come in as a \n character)
// 2) remove escape slashes
// 3) decode any bbcode from the message editor
// 4) decode any encoded html tags
// 5) remove html tags
$msg['textversion'] $msg['textversion']
= strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",$msg['body']))),ENT_QUOTES,'UTF-8')); = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",$msg['body']))),ENT_QUOTES,'UTF-8'));
//$TextMessage = html_entity_decode(strip_tags(bbcode(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",$msg['body'])))); ;
// html version
// process the message body to display properly in text mode
// 1) substitute a <br /> tag for the "\" then "n", so it behaves properly (it doesn't come in as a \n character)
// 2) remove escape slashes
// 3) decode any bbcode from the message editor
// 4) decode any encoded html tags
$msg['htmlversion'] $msg['htmlversion']
= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "<br />\n",$msg['body'])))); = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$msg['body']))));
$tpl = load_view_file('view/mail_received_eml.tpl'); // load the template for private message notifications
$tpl = load_view_file('view/mail_received_eml.tpl');
// import the data into the template
$email_tpl = replace_macros($tpl, array( $email_tpl = replace_macros($tpl, array(
'$siteName' => $a->config['sitename'], '$siteName' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$username' => $importer['username'], '$thumb' => $importer['thumb'], // thumbnail url for sender icon
'$thumb' => $importer['thumb'], '$email' => $importer['email'], // email address to send to
'$email' => $importer['email'], '$url' => $importer['url'], // full url for the site
'$url' => $importer['url'], '$from' => $msg['from-name'], // name of the person sending the message
'$senderName' => $importer['senderName'], '$title' => stripslashes($msg['title']), // subject of the message
'$from' => $msg['from-name'], '$textversion' => $msg['textversion'], // text version of the message
'$title' => stripslashes($msg['title']), '$htmlversion' => $msg['htmlversion'], // html version of the message
'$textversion' => $msg['textversion'], '$mimeboundary' => $msg['mimeboundary'], // mime message divider
'$htmlversion' => $msg['htmlversion'], '$hostname' => $a->get_hostname() // name of this host
'$mimeboundary' => $msg['mimeboundary'],
'$hostname' => $a->get_hostname()
)); ));
logger("message headers: " . $msg['headers']); logger("message headers: " . $msg['headers']);
logger("message body: " . $mail_tpl); logger("message body: " . $mail_tpl);
$res = mail($importer['email'], t('New mail received at ') . $a->config['sitename'], // send the message
$email_tpl, $msg['headers'] $res = mail(
/* 'From: ' . t('Administrator') . '@' . $a->get_hostname() . "\r\n" $importer['email'], // send to address
. 'MIME-Version: 1.0' . "\r\n" t('New mail received at ') . $a->config['sitename'], // subject
. 'Content-type: text/html; charset=utf-8' . "\r\n" $email_tpl, // message body
. 'Content-transfer-encoding: quoted-printable' . "\r\n" */ $msg['headers'] // message headers
); );
} }
xml_status(0); xml_status(0);