From dc47ef65f91643ac2accfe16b517ed847f6275f9 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 23 Dec 2014 00:55:36 +0100 Subject: [PATCH] Issue 1234: Add the account name to the notification mails. --- include/enotify.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/enotify.php b/include/enotify.php index 51263871b6..8b5002cb2a 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -21,6 +21,7 @@ function notification($params) { $thanks = t('Thank You,'); $sitename = $a->config['sitename']; $site_admin = sprintf( t('%s Administrator'), $sitename); + $nickname = ""; $sender_name = $product; $hostname = $a->get_hostname(); @@ -29,6 +30,10 @@ function notification($params) { $sender_email = t('noreply') . '@' . $hostname; + $user = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($params['uid'])); + if ($user) + $nickname = $user[0]["nickname"]; + // with $params['show_in_notification_page'] == false, the notification isn't inserted into // the database, and an email is sent if applicable. // default, if not specified: true @@ -37,6 +42,7 @@ function notification($params) { $additional_mail_header = ""; $additional_mail_header .= "Precedence: list\n"; $additional_mail_header .= "X-Friendica-Host: ".$hostname."\n"; + $additional_mail_header .= "X-Friendica-Account: <".$nickname."@".$hostname.">\n"; $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; $additional_mail_header .= "List-ID: \n"; @@ -344,7 +350,7 @@ function notification($params) { $show_in_notification_page = false; } - + $subject .= " (".$nickname."@".$hostname.")"; $h = array( 'params' => $params,