Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner

[friendica.git] / src / Module / BaseNotifications.php

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index 8a569e24f16f0295950f778e2d6ec71bc51d10bc..d7319fa4ea37681c1e4fcc135f79bf87a7541669 100644 (file)
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,7 @@
 namespace Friendica\Module;
 
 use Exception;
+use Friendica\App;
 use Friendica\App\Arguments;
 use Friendica\BaseModule;
 use Friendica\Content\Pager;
@@ -30,6 +31,8 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Navigation\Notifications\ValueObject\FormattedNotification;
 use Friendica\Network\HTTPException\ForbiddenException;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  * Base Module for each tab of the notification display
@@ -86,23 +89,21 @@ abstract class BaseNotifications extends BaseModule
         */
        abstract public function getNotifications();
 
-       public function __construct(Arguments $args, L10n $l10n, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                if (!local_user()) {
-                       throw new ForbiddenException($this->l10n->t('Permission denied.'));
+                       throw new ForbiddenException($this->t('Permission denied.'));
                }
 
                $page = ($_REQUEST['page'] ?? 0) ?: 1;
 
                $this->firstItemNum = ($page * self::ITEMS_PER_PAGE) - self::ITEMS_PER_PAGE;
                $this->showAll      = ($_REQUEST['show'] ?? '') === 'all';
-
-               $this->args = $args;
        }
 
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                // If the last argument of the query is NOT json, return
                if ($this->args->get($this->args->getArgc() - 1) !== 'json') {
@@ -144,7 +145,7 @@ abstract class BaseNotifications extends BaseModule
 
                $notif_tpl = Renderer::getMarkupTemplate('notifications/notifications.tpl');
                return Renderer::replaceMacros($notif_tpl, [
-                       '$header'        => $header ?? $this->l10n->t('Notifications'),
+                       '$header'        => $header ?? $this->t('Notifications'),
                        '$tabs'          => $tabs,
                        '$notifications' => $notifications,
                        '$noContent'     => $noContent,
@@ -167,7 +168,7 @@ abstract class BaseNotifications extends BaseModule
 
                foreach (self::URL_TYPES as $type => $url) {
                        $tabs[] = [
-                               'label'     => $this->l10n->t(self::PRINT_TYPES[$type]),
+                               'label'     => $this->t(self::PRINT_TYPES[$type]),
                                'url'       => 'notifications/' . $url,
                                'sel'       => (($selected == $url) ? 'active' : ''),
                                'id'        => $type . '-tab',