X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=68208ec5ac612f2d59ac743dbab082d446abb5e7;hb=edcf1466a749d59bc3bba8e5d1dc48508e10521a;hp=2b6eec576c8b63b007c05442acb3a20e1a9f1b5d;hpb=0c52866693add20fc4476e26a5c7ae14f5d5272a;p=friendica.git

diff --git a/include/enotify.php b/include/enotify.php
index 2b6eec576c..68208ec5ac 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -12,17 +12,14 @@ use Friendica\Database\DBM;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
 
-require_once 'include/bbcode.php';
-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)
 {
@@ -48,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'],
@@ -371,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']