aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-12-24 22:36:17 -0800
committerfriendica <info@friendica.com>2011-12-24 22:36:17 -0800
commitbef8f95ef3e638cb843810ed68cd9617e6e2cc48 (patch)
tree8fea5b0d4c21b78eb58c631a3fe6f14038086916 /include
parent0b598dedd04c185a17f28c5197a05472e1a54c12 (diff)
downloadvolse-hubzilla-bef8f95ef3e638cb843810ed68cd9617e6e2cc48.tar.gz
volse-hubzilla-bef8f95ef3e638cb843810ed68cd9617e6e2cc48.tar.bz2
volse-hubzilla-bef8f95ef3e638cb843810ed68cd9617e6e2cc48.zip
more enotify
Diffstat (limited to 'include')
-rw-r--r--include/enotify.php19
1 files changed, 9 insertions, 10 deletions
diff --git a/include/enotify.php b/include/enotify.php
index 5febe4113..cf0788e6a 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -38,10 +38,10 @@ function notification($params) {
$subject = sprintf( t('New mail received at %s'),$sitename);
- $new_email = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename);
- $email_visit = t('Please visit %s to view and/or reply to your private messages.');
- $email_tlink = sprintf( $email_visit, $siteurl . '/message' );
- $email_hlink = sprintf( $email_visit, '<a href="' . $siteurl . '/message">' . $sitename . '</a>');
+ $preamble = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename);
+ $sitelink = t('Please visit %s to view and/or reply to your private messages.');
+ $tsitelink = sprintf( $email_visit, $siteurl . '/message' );
+ $hsitelink = sprintf( $email_visit, '<a href="' . $siteurl . '/message">' . $sitename . '</a>');
}
@@ -53,14 +53,13 @@ function notification($params) {
push_lang($params['language']);
- $msg['notificationfromname'] = $sender_name;
- $msg['notificationfromemail'] = $sender_email;
+ $msg = array();
+ $msg['fromname'] = $sender_name;
+ $msg['fromemail'] = $sender_email;
- $msg['textversion']
- = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",
+ $msg['textversion'] = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",
$body))),ENT_QUOTES,'UTF-8'));
- $msg['htmlversion']
- = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"),
+ $msg['htmlversion'] = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"),
"<br />\n",$body))));
// load the template for private message notifications