updated private message notification to use HTML, still need the foreign language...

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 755d674c13f71d129d29a7d33cf774f7064f2f8e..49276647aea400a6d6688a4a91181ab895a0484c 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -2,8 +2,6 @@
 
 require_once('simplepie/simplepie.inc');
 require_once('include/items.php');
-
-
 function dfrn_notify_post(&$a) {
 
        $dfrn_id      = ((x($_POST,'dfrn_id'))      ? notags(trim($_POST['dfrn_id']))   : '');
@@ -52,11 +50,17 @@ function dfrn_notify_post(&$a) {
        }
                 
 
-       $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, 
-               `contact`.`pubkey` AS `cpubkey`, `contact`.`prvkey` AS `cprvkey`, `user`.* FROM `contact` 
-               LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
-               WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
-               AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
+       $r = q("SELECT  `contact`.*, `contact`.`uid` AS `importer_uid`, 
+                                       `contact`.`pubkey` AS `cpubkey`, 
+                                       `contact`.`prvkey` AS `cprvkey`, 
+                                       `contact`.`thumb` AS `thumb`, 
+                                       `contact`.`url` as `url`,
+                                       `contact`.`name` as `senderName`,
+                                       `user`.* 
+                       FROM `contact` 
+                       LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
+                       WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+                               AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
                dbesc($a->argv[1])
        );
 
@@ -169,29 +173,37 @@ function dfrn_notify_post(&$a) {
                require_once('bbcode.php');
                if($importer['notify-flags'] & NOTIFY_MAIL) {
 
-                       $body = html_entity_decode(strip_tags(bbcode(stripslashes($msg['body']))),ENT_QUOTES,'UTF-8');
-
-                       if(function_exists('quoted_printable_encode'))
+//                     $body = html_entity_decode(strip_tags(bbcode(stripslashes(nl2br($msg['body'])))),ENT_QUOTES,'UTF-8');
+//                     $body = strip_tags(bbcode(stripslashes(nl2br($msg['body']))));
+                       
+                       /*if(function_exists('quoted_printable_encode'))
                                $body = quoted_printable_encode($body);
                        else
-                               $body = qp($body);
+                               $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'])));                    
                        $tpl = load_view_file('view/mail_received_eml.tpl');                    
                        $email_tpl = replace_macros($tpl, array(
-                               '$sitename' => $a->config['sitename'],
-                               '$siteurl' =>  $a->get_baseurl(),
-                               '$username' => $importer['username'],
-                               '$email' => $importer['email'],
-                               '$from' => $msg['from-name'],
-                               '$title' => stripslashes($msg['title']),
-                               '$body' => $body
+                               '$siteName'             => $a->config['sitename'],
+                               '$siteurl'              => $a->get_baseurl(),
+                               '$username'             => $importer['username'],
+                               '$thumb'                => $importer['thumb'],
+                               '$email'                => $importer['email'],
+                               '$url'                  => $importer['url'],
+                               '$senderName'   => $importer['senderName'],
+                               '$from'                 => $msg['from-name'],
+                               '$title'                => stripslashes($msg['title']),
+                               '$body'                 => $msg['body'],
+                               '$hostname'             => $a->get_hostname()
                        ));
-
+                       
                        $res = mail($importer['email'], t('New mail received at ') . $a->config['sitename'],
-                               $email_tpl, 'From: ' . t('Administrator') . '@' . $a->get_hostname() . "\r\n"
+                               $email_tpl, 
+                                       'From: ' . t('Administrator') . '@' . $a->get_hostname() . "\r\n"
                                        . 'MIME-Version: 1.0' . "\r\n"
-                                       . 'Content-type: text/plain; charset=UTF-8' . "\r\n" 
-                                       . 'Content-transfer-encoding: quoted-printable' . "\r\n"
+                                       . 'Content-type: text/html; charset=iso-8859-1' . "\r\n" 
+                                       . 'Content-transfer-encoding: 7-bit' . "\r\n"
                        );
                }
                xml_status(0);

diff --git a/view/en/mail_received_eml.tpl b/view/en/mail_received_eml.tpl
index 261aec4bedbe6cfb5363bd6488dd2606bc476d9c..5109785829e2f1effc86cf6338c0f051d5d7ce88 100644 (file)
--- a/view/en/mail_received_eml.tpl
+++ b/view/en/mail_received_eml.tpl
@@ -1,16 +1,25 @@
+<!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>
 
-Dear $username,
+       <tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr>
 
-       You've received a new private message at $sitename from '$from'.
------
-$title
------
-$body
------
-Please login at $siteurl to read and reply to your private messages.
-
-Thank you,
-       $sitename administrator
-
- 
 
+       <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-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>
+       </tbody>
+</table>
+</body>
+</html>
\ No newline at end of file