Some more API functions moved

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

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index 4deb2a24cca5e81e0f38bc1452e956647e623b4d..e7f9bdabe374508328eec7d0a446f33677b025c0 100644 (file)
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
@@ -8,8 +27,8 @@ use Friendica\Content\Pager;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
+use Friendica\Navigation\Notifications\ValueObject\FormattedNotification;
 use Friendica\Network\HTTPException\ForbiddenException;
-use Friendica\Object\Notification\Notification;
 
 /**
  * Base Module for each tab of the notification display
@@ -20,29 +39,29 @@ abstract class BaseNotifications extends BaseModule
 {
        /** @var array Array of URL parameters */
        const URL_TYPES = [
-               Notification::NETWORK  => 'network',
-               Notification::SYSTEM   => 'system',
-               Notification::HOME     => 'home',
-               Notification::PERSONAL => 'personal',
-               Notification::INTRO    => 'intros',
+               FormattedNotification::NETWORK  => 'network',
+               FormattedNotification::SYSTEM   => 'system',
+               FormattedNotification::HOME     => 'home',
+               FormattedNotification::PERSONAL => 'personal',
+               FormattedNotification::INTRO    => 'intros',
        ];
 
        /** @var array Array of the allowed notifications and their printable name */
        const PRINT_TYPES = [
-               Notification::NETWORK  => 'Network',
-               Notification::SYSTEM   => 'System',
-               Notification::HOME     => 'Home',
-               Notification::PERSONAL => 'Personal',
-               Notification::INTRO    => 'Introductions',
+               FormattedNotification::NETWORK  => 'Network',
+               FormattedNotification::SYSTEM   => 'System',
+               FormattedNotification::HOME     => 'Home',
+               FormattedNotification::PERSONAL => 'Personal',
+               FormattedNotification::INTRO    => 'Introductions',
        ];
 
        /** @var array The array of access keys for notification pages */
        const ACCESS_KEYS = [
-               Notification::NETWORK  => 'w',
-               Notification::SYSTEM   => 'y',
-               Notification::HOME     => 'h',
-               Notification::PERSONAL => 'r',
-               Notification::INTRO    => 'i',
+               FormattedNotification::NETWORK  => 'w',
+               FormattedNotification::SYSTEM   => 'y',
+               FormattedNotification::HOME     => 'h',
+               FormattedNotification::PERSONAL => 'r',
+               FormattedNotification::INTRO    => 'i',
        ];
 
        /** @var int The default count of items per page */
@@ -83,7 +102,7 @@ abstract class BaseNotifications extends BaseModule
                }
 
                // Set the pager
-               $pager = new Pager(DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
 
                // Add additional informations (needed for json output)
                $notifications = [
@@ -113,7 +132,7 @@ abstract class BaseNotifications extends BaseModule
                $tabs = self::getTabs();
 
                // Set the pager
-               $pager = new Pager(DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
 
                $notif_tpl = Renderer::getMarkupTemplate('notifications/notifications.tpl');
                return Renderer::replaceMacros($notif_tpl, [