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['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)."-"
+ .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"), "<br />\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'],
'$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);
+--$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
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+ <title>Friendika Nachricht</title>
+ <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+ <tbody>
+ <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+
+ <tr><td style="padding-top:22px;" colspan="2">Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.</td></tr>
+
-
+ <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+ <td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+ <tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+ <tr><td style="padding-right:22px;">$htmlversion</td></tr>
+ <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu beantworten.</td></tr>
+ <tr><td></td><td>Viele Grüße,</td></tr>
+ <tr><td></td><td>$siteName Administrator</td></tr>
+ </tbody>
+</table>
+</body>
+</html>
+--$mimeboundary--
\ No newline at end of file
+--$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
+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
- <tr><td style="padding-right:22px;">$body</td></tr>
+ <tr><td style="padding-right:22px;">$htmlversion</td></tr>
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at $siteurl to read and reply to your private messages.</td></tr>
- <tr><td style="padding-left:90px;" colspan="2">Thank you,</td></tr>
- <tr><td style="padding-left:90px;" colspan="2">$siteName administrator</td></tr>
+ <tr><td></td><td>Thank You,</td></tr>
+ <tr><td></td><td>$siteName Administrator</td></tr>
</tbody>
</table>
</body>
-</html>
\ No newline at end of file
+</html>
+
+--$mimeboundary--
+
+--$mimeboundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
-Dear $username,
-
- You've received a new private message at $sitename from '$from'.
------
+$from t'a envoy\8e un message \88 $siteName.
+
$title
------
-$body
------
-Please login at $siteurl to read and reply to your private messages.
-Thank you,
- $sitename administrator
+$textversion
+
+Ouvrez une session svp \88 $siteurl pour lire et r\8epondre \88 vos messages priv\8es.
+
+Merci,
+$siteName Administrateur
+
+--$mimeboundary
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+ <title>Friendika Message</title>
+ <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+ <tbody>
+ <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+
+ <tr><td style="padding-top:22px;" colspan="2">$from t'a envoy\8e un message \88 $siteName.</td></tr>
+
-
+ <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+ <td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+ <tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+ <tr><td style="padding-right:22px;">$htmlversion</td></tr>
+ <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Ouvrez une session svp \88 $siteurl pour lire et r\8epondre \88 vos messages priv\8es.</td></tr>
+ <tr><td></td><td>Merci,</td></tr>
+ <tr><td></td><td>$siteName Administrateur</td></tr>
+ </tbody>
+</table>
+</body>
+</html>
+--$mimeboundary--
\ No newline at end of file
+--$mimeboundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
-Caro/a $username,
-
- Hai ricevuto un nuovo messsaggio privato su $sitename da '$from'.
------
+Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.
+
$title
------
-$body
------
+
+$textversion
+
Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
Grazie,
- L'amministratore di $sitename
+L'amministratore di $siteName
+
+--$mimeboundary
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+ <title>Friendika Messsaggio</title>
+ <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+ <tbody>
+ <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+
+ <tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</td></tr>
+
-
+ <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+ <td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+ <tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+ <tr><td style="padding-right:22px;">$htmlversion</td></tr>
+ <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.</td></tr>
+ <tr><td></td><td>Grazie,</td></tr>
+ <tr><td></td><td>L'amministratore di $siteName</td></tr>
+ </tbody>
+</table>
+</body>
+</html>
+--$mimeboundary--
\ No newline at end of file
projects / friendica.git / commitdiff