X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=68208ec5ac612f2d59ac743dbab082d446abb5e7;hb=edcf1466a749d59bc3bba8e5d1dc48508e10521a;hp=1e2008392d3438494ee0c20d1850f116ef8dd7b9;hpb=3086666c38e6595d2254a08534668b900524927f;p=friendica.git diff --git a/include/enotify.php b/include/enotify.php index 1e2008392d..68208ec5ac 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -16,10 +16,10 @@ use Friendica\Util\Emailer; * @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) { @@ -45,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'], @@ -368,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']