diff options
Diffstat (limited to 'mod/dfrn_notify.php')
| -rw-r--r-- | mod/dfrn_notify.php | 55 |
1 files changed, 14 insertions, 41 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index b8d86ad24..cd7b0cff0 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -173,22 +173,10 @@ function dfrn_notify_post(&$a) { require_once('bbcode.php'); 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 $msg['notificationfromname'] = t('Administrator'); // noreply address to send from $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 // 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 $msg['htmlversion'] = 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 $tpl = load_view_file('view/mail_received_html_body_eml.tpl'); $email_html_body_tpl = replace_macros($tpl,array( @@ -238,32 +226,17 @@ function dfrn_notify_post(&$a) { '$mimeboundary' => $msg['mimeboundary'], // mime message divider '$hostname' => $a->get_hostname() // name of this host )); - - // 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( - '$siteurl' => $a->get_baseurl(), // descriptive url of this site - '$email' => $importer['email'], // email address to send to - '$from' => $msg['from-name'], // name of the person sending the message - '$title' => stripslashes($msg['title']), // subject of the message - '$mimeboundary' => $msg['mimeboundary'], // mime message divider - '$hostname' => $a->get_hostname(), // name of this host - '$htmlbody' => chunk_split(base64_encode($email_html_body_tpl)), - '$textbody' => chunk_split(base64_encode($email_text_body_tpl)) - )); - - logger("message headers: " . $msg['headers']); - logger("message body: " . $mail_tpl); - - - // send the message - $res = mail( - $importer['email'], // send to address - t('New mail received at ') . $a->config['sitename'], // subject - $email_tpl, // message body - $msg['headers'] // message headers + + // use the EmailNotification library to send the message + require_once("include/EmailNotification.php"); + EmailNotification::sendTextHtmlEmail( + $msg['notificationfromname'], + $msg['notificationfromemail'], + $msg['notificationfromemail'], + $importer['email'], + t('New mail received at ') . $a->config['sitename'], + $email_html_body_tpl, + $email_text_body_tpl ); } xml_status(0); @@ -411,7 +384,7 @@ function dfrn_notify_post(&$a) { '$email' => $importer['email'], '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, '$from' => $from, - '$body' => strip_tags(bbcode(stripslashes($datarray['body']))) + '$body' => html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8') )); $res = mail($importer['email'], $from . t(' commented on an item at ') . $a->config['sitename'], @@ -477,7 +450,7 @@ function dfrn_notify_post(&$a) { '$email' => $importer['email'], '$from' => $from, '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, - '$body' => strip_tags(bbcode(stripslashes($datarray['body']))) + '$body' => html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8') )); $res = mail($importer['email'], $from . t(" commented on an item at ") |