Merge pull request #5106 from tobiasd/20180521-en

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index e0629a53eb4236a5e9ebba575a7feed823462173..39c74fdc64a0ae8c1c27156114ced1ea085db07e 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -12,8 +12,6 @@ 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
  *
@@ -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'],
@@ -362,7 +357,7 @@ function notification($params)
        if ($params['type'] == NOTIFY_SYSTEM) {
                switch($params['event']) {
                        case "SYSTEM_REGISTER_REQUEST":
-                               $subject = L10n::t('[Friendica System:Notify] registration request');
+                               $subject = L10n::t('[Friendica System Notify]') . ' ' . L10n::t('registration request');
 
                                $preamble = L10n::t('You\'ve received a registration request from \'%1$s\' at %2$s', $params['source_name'], $sitename);
                                $epreamble = L10n::t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.',