Merge pull request #4541 from rabuzarus/20180303_-_fix_directory_search

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index 44fca484cc1f17cea5d582d760b13b0af6386b38..c877540aba378d14100d0974b338d7154cf0e53d 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -2,15 +2,16 @@
 /**
  * @file include/enotify.php
  */
-use Friendica\App;
+
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
 
-require_once 'include/bbcode.php';
 require_once 'include/html2bbcode.php';
 
 /**
@@ -347,7 +348,7 @@ function notification($params)
                                '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
                        );
 
-                       $body =  L10n::t('\'%1$s\' has chosen to accept you a "fan", which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.', $params['source_name']);
+                       $body =  L10n::t('\'%1$s\' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.', $params['source_name']);
                        $body .= "\n\n";
                        $body .= L10n::t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.', $params['source_name']);
 
@@ -369,7 +370,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 (%4$s)',
+                               $body = L10n::t('Full Name:     %1$s\nSite Location:    %2$s\nLogin Name:       %3$s ' . "\x28" . '%4$s' . "\x28",
                                        $params['source_name'],
                                        $siteurl, $params['source_mail'],
                                        $params['source_nick']
@@ -447,10 +448,10 @@ function notification($params)
                $datarray = [];
                $datarray['hash']  = $hash;
                $datarray['name']  = $params['source_name'];
-               $datarray['name_cache'] = strip_tags(bbcode($params['source_name']));
+               $datarray['name_cache'] = strip_tags(BBCode::convert($params['source_name']));
                $datarray['url']   = $params['source_link'];
                $datarray['photo'] = $params['source_photo'];
-               $datarray['date']  = datetime_convert();
+               $datarray['date']  = DateTimeFormat::utcNow();
                $datarray['uid']   = $params['uid'];
                $datarray['link']  = $itemlink;
                $datarray['iid']   = $item_id;
@@ -518,7 +519,7 @@ function notification($params)
 
                $itemlink = System::baseUrl().'/notify/view/'.$notify_id;
                $msg = replace_macros($epreamble, ['$itemlink' => $itemlink]);
-               $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(bbcode($msg)));
+               $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(BBCode::convert($msg)));
                q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
                        dbesc($msg),
                        dbesc($msg_cache),
@@ -566,9 +567,9 @@ function notification($params)
                }
 
                // textversion keeps linebreaks
-               $textversion = strip_tags(str_replace("<br>", "\n", html_entity_decode(bbcode(stripslashes(str_replace(["\\r\\n", "\\r", "\\n"], "\n",
+               $textversion = strip_tags(str_replace("<br>", "\n", html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r\\n", "\\r", "\\n"], "\n",
                        $body))),ENT_QUOTES, 'UTF-8')));
-               $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(["\\r\\n", "\\r", "\\n\\n", "\\n"],
+               $htmlversion = html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r\\n", "\\r", "\\n\\n", "\\n"],
                        "<br />\n", $body))), ENT_QUOTES, 'UTF-8');
 
                $datarray = [];