aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/enotify.php22
-rw-r--r--view/email_notify_html.tpl8
2 files changed, 16 insertions, 14 deletions
diff --git a/include/enotify.php b/include/enotify.php
index cf0788e6a..11a5d70dd 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -63,19 +63,21 @@ function notification($params) {
"<br />\n",$body))));
// load the template for private message notifications
- $tpl = get_intltext_template('mail_received_html_body_eml.tpl');
+ $tpl = get_view_template('email_notify_html.tpl');
$email_html_body_tpl = replace_macros($tpl,array(
- '$username' => $importer['username'],
- '$siteName' => $a->config['sitename'], // name of this site
- '$siteurl' => $a->get_baseurl(), // descriptive url of this site
- '$thumb' => $importer['thumb'], // thumbnail url for sender icon
- '$email' => $importer['email'], // email address to send to
- '$url' => $importer['url'], // full url for the site
- '$from' => $msg['from-name'], // name of the person sending the message
+ '$banner' => $banner,
+ '$product' => $product,
+ '$preamble' => $preamble,
+ '$source_name' => $parama['source_name'],
+ '$source_link' => $params['source_link'],
+ '$source_photo' => $params['source_photo'],
+ '$username' => $params['to_name'],
+ '$hsitelink' => $hsitelink,
+ '$thanks' => $thanks,
+ '$site_admin' => $site_admin,
'$title' => stripslashes($msg['title']), // subject of the message
'$htmlversion' => $msg['htmlversion'], // html version of the message
- '$mimeboundary' => $msg['mimeboundary'], // mime message divider
- '$hostname' => $a->get_hostname() // name of this host
+
));
// load the template for private message notifications
diff --git a/view/email_notify_html.tpl b/view/email_notify_html.tpl
index f020b7365..ab449de52 100644
--- a/view/email_notify_html.tpl
+++ b/view/email_notify_html.tpl
@@ -7,19 +7,19 @@
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#084769; 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; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
+ <tr><td colspan="2" style="background:#084769; 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; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">$product</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$preamble</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="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$source_link"><img style="border:0px;width:48px;height:48px;" src="$source_photo"></a></td>
+ <td style="padding-top:22px;"><a href="$source_link">$source_name</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">$hsitelink</td></tr>
<tr><td></td><td>$thanks</td></tr>
- <tr><td></td><td>$sit_admin</td></tr>
+ <tr><td></td><td>$site_admin</td></tr>
</tbody>
</table>
</body>