Merge branch '3.6-rc' of https://github.com/Andi-K/friendica into 3.6-rc

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index 2b8c36e257d9c58929337feb927f3dd7c1093ae1..e0629a53eb4236a5e9ebba575a7feed823462173 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -3,6 +3,7 @@
  * @file include/enotify.php
  */
 
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -11,17 +12,16 @@ 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)
 {
@@ -370,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 ' . "\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']
@@ -448,7 +448,7 @@ 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']  = DateTimeFormat::utcNow();
@@ -519,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),
@@ -567,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 = [];