Remove DI dependency from Module\Contact\Profile

[friendica.git] / src / Module / Notifications / Ping.php

diff --git a/src/Module/Notifications/Ping.php b/src/Module/Notifications/Ping.php
index dd9e8cccde61a381b48c663c6c69fe27acacf5d1..603d6408c7bde7c008f73772441ab63d15fd76e4 100644 (file)
--- a/src/Module/Notifications/Ping.php
+++ b/src/Module/Notifications/Ping.php
@@ -24,7 +24,7 @@ namespace Friendica\Module\Notifications;
 use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Contact\Introduction\Repository\Introduction;
-use Friendica\Content\ForumManager;
+use Friendica\Content\GroupManager;
 use Friendica\Core\Cache\Capability\ICanCache;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -52,6 +52,7 @@ use Friendica\Network\HTTPException;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
+use Friendica\Util\Strings;
 use GuzzleHttp\Psr7\Uri;
 use Psr\Log\LoggerInterface;
 
@@ -109,14 +110,14 @@ class Ping extends BaseModule
                $register_count  = 0;
                $sysnotify_count = 0;
                $circles_unseen   = [];
-               $forums_unseen   = [];
+               $groups_unseen   = [];
 
                $event_count          = 0;
                $today_event_count    = 0;
                $birthday_count       = 0;
                $today_birthday_count = 0;
 
-               // Suppress notification display for forum accounts
+               // Suppress notification display for group accounts
                if ($this->session->getLocalUserId() && $this->session->get('page_flags', '') != User::PAGE_FLAGS_COMMUNITY) {
                        if ($this->pconfig->get($this->session->getLocalUserId(), 'system', 'detailed_notif')) {
                                $notifications = $this->notificationRepo->selectDetailedForUser($this->session->getLocalUserId());
@@ -160,9 +161,9 @@ class Ping extends BaseModule
                                        }
                                }
 
-                               foreach (ForumManager::countUnseenItems() as $forum_count) {
-                                       if ($forum_count['count'] > 0) {
-                                               $forums_unseen[] = $forum_count;
+                               foreach (GroupManager::countUnseenItems() as $group_count) {
+                                       if ($group_count['count'] > 0) {
+                                               $groups_unseen[] = $group_count;
                                        }
                                }
                        }
@@ -174,7 +175,7 @@ class Ping extends BaseModule
                        $myurl      = $this->session->getMyUrl();
                        $mail_count = $this->database->count('mail', ["`uid` = ? AND NOT `seen` AND `from-url` != ?", $this->session->getLocalUserId(), $myurl]);
 
-                       if (intval($this->config->get('config', 'register_policy')) === Register::APPROVE && $this->app->isSiteAdmin()) {
+                       if (intval($this->config->get('config', 'register_policy')) === Register::APPROVE && $this->session->isSiteAdmin()) {
                                $registrations = \Friendica\Model\Register::getPending();
                                $register_count = count($registrations);
                        }
@@ -290,14 +291,14 @@ class Ping extends BaseModule
                $data['birthdays']       = $birthday_count;
                $data['birthdays-today'] = $today_birthday_count;
                $data['circles']         = $circles_unseen;
-               $data['forums']          = $forums_unseen;
+               $data['groups']          = $groups_unseen;
                $data['notification']    = ($notification_count < 50) ? $notification_count : '49+';
 
                $data['notifications'] = $navNotifications;
 
                $data['sysmsgs'] = [
-                       'notice' => $this->systemMessages->flushNotices(),
-                       'info'   => $this->systemMessages->flushInfos(),
+                       'notice' => array_map([Strings::class, 'escapeHtml'], $this->systemMessages->flushNotices()),
+                       'info'   => array_map([Strings::class, 'escapeHtml'], $this->systemMessages->flushInfos()),
                ];
 
                if (isset($_GET['callback'])) {