$thanks = t('Thank You,');
$sitename = $a->config['sitename'];
$site_admin = sprintf( t('%s Administrator'), $sitename);
+ $nickname = "";
$sender_name = $product;
$hostname = $a->get_hostname();
if(strpos($hostname,':'))
$hostname = substr($hostname,0,strpos($hostname,':'));
+
+ $sender_email = $a->config['sender_email'];
+ if (empty($sender_email)) {
+ $sender_email = t('noreply') . '@' . $hostname;
+ }
- $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.
$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: <notification.".$hostname.">\n";
$sitelink = t('Please visit %s to approve or reject the request.');
$tsitelink = sprintf( $sitelink, $params['link'] );
- $hsitelink = sprintf( $sitelink, '<a href="' . $params['link'] . '">' . $sitename . '</a>');
+ $hsitelink = sprintf( $sitelink, '<a href="' . $params['link'] . '">' . $sitename . '</a><br><br>');
$itemlink = $params['link'];
break;
case "SYSTEM_DB_UPDATE_FAIL":
// add a notification to the user, with could be inexistent)
$subject = $params['subject'];
$preamble = $params['preamble'];
- if (x($params,'epreamble')){
- $epreamble = $params['epreamble'];
- } else {
- $epreamble = str_replace("\n","<br>\n",$preamble);
- }
$body = $params['body'];
$sitelink = "";
$tsitelink = "";
$show_in_notification_page = false;
}
-
+ $subject .= " (".$nickname."@".$hostname.")";
$h = array(
'params' => $params,
call_hooks('enotify_mail', $datarray);
// check whether sending post content in email notifications is allowed
- $content_allowed = !get_config('system','enotify_no_content');
+ // always true for "SYSTEM_EMAIL"
+ $content_allowed = ((!get_config('system','enotify_no_content')) || ($params['type'] == "SYSTEM_EMAIL"));
// load the template for private message notifications
$tpl = get_markup_template('email_notify_html.tpl');
$email_html_body = replace_macros($tpl,array(
'$banner' => $datarray['banner'],
'$product' => $datarray['product'],
- '$preamble' => $datarray['preamble'],
+ '$preamble' => str_replace("\n","<br>\n",$datarray['preamble']),
'$sitename' => $datarray['sitename'],
'$siteurl' => $datarray['siteurl'],
'$source_name' => $datarray['source_name'],
// use the Emailer class to send the message
- Emailer::send(array(
+ return Emailer::send(array(
+ 'uid' => $params['uid'],
'fromName' => $sender_name,
'fromEmail' => $sender_email,
'replyTo' => $sender_email,
'textVersion' => $email_text_body,
'additionalMailHeader' => $datarray['headers'],
));
- return True;
}
return False;