diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 49276647a..ffd9020c5 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -181,8 +181,28 @@ function dfrn_notify_post(&$a) {
else
$body = qp($body);*/
- $msg['body'] = str_replace(array("\\r\\n", "\\r", "\\n"), "
", $msg['body']);
- $msg['body'] = html_entity_decode(strip_tags(bbcode($msg['body'])));
+ //$msg['body'] = str_replace(array("\\r\\n", "\\r", "\\n"), "
", $msg['body']);
+ //$msg['body'] = html_entity_decode(strip_tags(bbcode($msg['body'])));
+ $msg['mimeboundary'] =rand(0,9)."-"
+ .rand(10000000000,9999999999)."-"
+ .rand(10000000000,9999999999)."=:"
+ .rand(10000,99999);
+
+ $msg['notificationfromname'] = t('Administrator');
+ $msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname();
+ $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']}\"";
+
+
+ $msg['textversion']
+ = html_entity_decode(strip_tags(bbcode(stripslashes($msg['body']))),ENT_QUOTES,'UTF-8');
+ //$TextMessage = html_entity_decode(strip_tags(bbcode(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",$msg['body'])))); ;
+ $msg['htmlversion']
+ = str_replace(array("\\r\\n", "\\r", "\\n"), "
\n",html_entity_decode($msg['body']));
+
$tpl = load_view_file('view/mail_received_eml.tpl');
$email_tpl = replace_macros($tpl, array(
'$siteName' => $a->config['sitename'],
@@ -194,16 +214,22 @@ function dfrn_notify_post(&$a) {
'$senderName' => $importer['senderName'],
'$from' => $msg['from-name'],
'$title' => stripslashes($msg['title']),
- '$body' => $msg['body'],
+ '$textversion' => $msg['textversion'],
+ '$htmlversion' => $msg['htmlversion'],
+ '$mimeboundary' => $msg['mimeboundary'],
'$hostname' => $a->get_hostname()
));
+ logger("message headers: " . $msg['headers']);
+ logger("message body: " . $mail_tpl);
+
+
$res = mail($importer['email'], t('New mail received at ') . $a->config['sitename'],
- $email_tpl,
- 'From: ' . t('Administrator') . '@' . $a->get_hostname() . "\r\n"
+ $email_tpl, $msg['headers']
+ /* 'From: ' . t('Administrator') . '@' . $a->get_hostname() . "\r\n"
. 'MIME-Version: 1.0' . "\r\n"
- . 'Content-type: text/html; charset=iso-8859-1' . "\r\n"
- . 'Content-transfer-encoding: 7-bit' . "\r\n"
+ . 'Content-type: text/html; charset=utf-8' . "\r\n"
+ . 'Content-transfer-encoding: quoted-printable' . "\r\n" */
);
}
xml_status(0);
diff --git a/view/de/mail_received_eml.tpl b/view/de/mail_received_eml.tpl
index 466d31e79..174aa4f97 100644
--- a/view/de/mail_received_eml.tpl
+++ b/view/de/mail_received_eml.tpl
@@ -1,17 +1,47 @@
+--$mimeboundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
-Lieber $username,
-
-du hast eine neue private Nachricht von '$from' auf '$sitename' erhhalten.
------
+Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.
+
$title
------
-$body
------
+
+$textversion
+
Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu
beantworten.
Viele Grüße,
- $sitename Administrator
+$siteName Administrator
-
+--$mimeboundary
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+
+
+
+ Friendika Nachricht
+
+
+
+
+
+  Friendika |
+ | Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten. |
+
+
+  |
+ $from |
+ | $title |
+ | $htmlversion |
+ | Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu beantworten. |
+ | Viele Grüße, |
+ | $siteName Administrator |
+
+
+
+
+
+--$mimeboundary--
\ No newline at end of file
diff --git a/view/en/mail_received_eml.tpl b/view/en/mail_received_eml.tpl
index 510978582..68df07c3d 100644
--- a/view/en/mail_received_eml.tpl
+++ b/view/en/mail_received_eml.tpl
@@ -1,3 +1,22 @@
+--$mimeboundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+$from sent you a new private message at $siteName.
+
+$title
+
+$textversion
+
+Please login at $siteurl to read and reply to your private messages.
+
+Thank you,
+$siteName administrator
+
+--$mimeboundary
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
@@ -15,11 +34,14 @@
|
$from |
| $title |
- | $body |
+ | $htmlversion |
| Please login at $siteurl to read and reply to your private messages. |
- | Thank you, |
- | $siteName administrator |
+ | Thank You, |
+ | $siteName Administrator |
-
\ No newline at end of file
+