Merge pull request #11128 from annando/diaspora-contact-details

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

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index ea53b9c52a013eef8f5185ad0fa655670e8f55a2..bd19fb4777c35b55b8673b4c17ef276304649afc 100644 (file)
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -22,15 +22,17 @@
 namespace Friendica\Module;
 
 use Exception;
+use Friendica\App;
 use Friendica\App\Arguments;
 use Friendica\BaseModule;
 use Friendica\Content\Pager;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\DI;
 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
@@ -87,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') {
@@ -138,14 +138,14 @@ abstract class BaseNotifications extends BaseModule
        protected function printContent(string $header, array $notifications, string $noContent, array $showLink)
        {
                // Get the nav tabs for the notification pages
-               $tabs = self::getTabs();
+               $tabs = $this->getTabs();
 
                // Set the pager
-               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
+               $pager = new Pager($this->l10n, $this->args->getQueryString(), self::ITEMS_PER_PAGE);
 
                $notif_tpl = Renderer::getMarkupTemplate('notifications/notifications.tpl');
                return Renderer::replaceMacros($notif_tpl, [
-                       '$header'        => $header ?? DI::l10n()->t('Notifications'),
+                       '$header'        => $header ?? $this->t('Notifications'),
                        '$tabs'          => $tabs,
                        '$notifications' => $notifications,
                        '$noContent'     => $noContent,
@@ -160,15 +160,15 @@ abstract class BaseNotifications extends BaseModule
         * @return array with with notifications TabBar data
         * @throws Exception
         */
-       private static function getTabs()
+       private function getTabs()
        {
-               $selected = DI::args()->get(1, '');
+               $selected = $this->args->get(1, '');
 
                $tabs = [];
 
                foreach (self::URL_TYPES as $type => $url) {
                        $tabs[] = [
-                               'label'     => DI::l10n()->t(self::PRINT_TYPES[$type]),
+                               'label'     => $this->t(self::PRINT_TYPES[$type]),
                                'url'       => 'notifications/' . $url,
                                'sel'       => (($selected == $url) ? 'active' : ''),
                                'id'        => $type . '-tab',