Merge pull request #4794 from Rudloff/feature/return_type

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index c877540aba378d14100d0974b338d7154cf0e53d..68208ec5ac612f2d59ac743dbab082d446abb5e7 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -12,16 +12,14 @@ use Friendica\Database\DBM;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
 
-require_once 'include/html2bbcode.php';
-
 /**
  * @brief Creates a notification entry and possibly sends a mail
  *
  * @param array $params Array with the elements:
-                       uid, item, parent, type, otype, verb, event,
-                       link, subject, body, to_name, to_email, source_name,
-                       source_link, activity, preamble, notify_flags,
-                       language, show_in_notification_page
+ *                     uid, item, parent, type, otype, verb, event,
+ *                     link, subject, body, to_name, to_email, source_name,
+ *                     source_link, activity, preamble, notify_flags,
+ *                     language, show_in_notification_page
  */
 function notification($params)
 {
@@ -47,10 +45,7 @@ function notification($params)
                $hostname = substr($hostname, 0, strpos($hostname, ':'));
        }
 
-       $sender_email = $a->config['sender_email'];
-       if (empty($sender_email)) {
-               $sender_email = L10n::t('noreply').'@'.$hostname;
-       }
+       $sender_email = $a->getSenderEmailAddress();
 
        if ($params['type'] != SYSTEM_EMAIL) {
                $user = dba::selectFirst('user', ['nickname', 'page-flags'],
@@ -370,7 +365,7 @@ function notification($params)
                                        '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
                                );
 
-                               $body = L10n::t('Full Name:     %1$s\nSite Location:    %2$s\nLogin Name:       %3$s ' . "\x28" . '%4$s' . "\x28",
+                               $body = L10n::t('Full Name:     %1$s\nSite Location:    %2$s\nLogin Name:       %3$s ' . "\x28" . '%4$s' . "\x29",
                                        $params['source_name'],
                                        $siteurl, $params['source_mail'],
                                        $params['source_nick']