aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-21 20:40:31 -0800
committerfriendica <info@friendica.com>2013-11-21 20:40:31 -0800
commit4be581494e03aa7c79c5691e64b75bee313d778f (patch)
treeaa0283940de838e96fbeebb3e9732993e7a1986c
parentdf14825b49ce0dd3a4575fcf8772b8d18b2a4852 (diff)
downloadvolse-hubzilla-4be581494e03aa7c79c5691e64b75bee313d778f.tar.gz
volse-hubzilla-4be581494e03aa7c79c5691e64b75bee313d778f.tar.bz2
volse-hubzilla-4be581494e03aa7c79c5691e64b75bee313d778f.zip
add recipient name to some of the notification emails for those who have a lot of channels and it isn't always obvious which channel is getting the notification. If this works out we should probably add this to the rest of them.
-rw-r--r--include/enotify.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/enotify.php b/include/enotify.php
index 91b37a913..cfa8c25ae 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -79,7 +79,7 @@ function notification($params) {
logger('notification: mail');
$subject = sprintf( t('[Red:Notify] New mail received at %s'),$sitename);
- $preamble = sprintf( t('%1$s sent you a new private message at %2$s.'),$sender['xchan_name'],$sitename);
+ $preamble = sprintf( t('%1$s, %2$s sent you a new private message at %3$s.'),$recip['channel_name'], $sender['xchan_name'],$sitename);
$epreamble = sprintf( t('%1$s sent you %2$s.'),'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a private message') . '[/zrl]');
$sitelink = t('Please visit %s to view and/or reply to your private messages.');
$tsitelink = sprintf( $sitelink, $siteurl . '/message/' . $params['item']['id'] );
@@ -198,7 +198,7 @@ function notification($params) {
}
$subject = sprintf( t('[Red:Notify] %s tagged you') , $sender['xchan_name']);
- $preamble = sprintf( t('%1$s tagged you at %2$s') , $sender['xchan_name'], $sitename);
+ $preamble = sprintf( t('%1$s, %2$s tagged you at %3$s') , $recip['channel_name'], $sender['xchan_name'], $sitename);
$epreamble = sprintf( t('%1$s [zrl=%2$s]tagged you[/zrl].') ,
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
$params['link']);
@@ -212,7 +212,7 @@ function notification($params) {
if($params['type'] == NOTIFY_POKE) {
$subject = sprintf( t('[Red:Notify] %1$s poked you') , $sender['xchan_name']);
- $preamble = sprintf( t('%1$s poked you at %2$s') , $sender['xchan_name'], $sitename);
+ $preamble = sprintf( t('%1$s, %2$s poked you at %3$s') , $recip['channel_name'], $sender['xchan_name'], $sitename);
$epreamble = sprintf( t('%1$s [zrl=%2$s]poked you[/zrl].') ,
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
$params['link']);