Merge pull request #8834 from MrPetovan/task/introduce-stable-branch

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

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index 728a9d402d865f5e58d5bd0e834289d611b1d659..4715641c2f59233258c583eb76efea50de60d85e 100644 (file)
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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\Model\Notification;
 use Friendica\Network\HTTPException\ForbiddenException;
+use Friendica\Object\Notification\Notification;
 
 /**
  * Base Module for each tab of the notification display
@@ -47,6 +66,8 @@ abstract class BaseNotifications extends BaseModule
 
        /** @var int The default count of items per page */
        const ITEMS_PER_PAGE = 20;
+       /** @var int The default limit of notifications per page */
+       const DEFAULT_PAGE_LIMIT = 80;
 
        /** @var boolean True, if ALL entries should get shown */
        protected static $showAll;
@@ -73,30 +94,6 @@ abstract class BaseNotifications extends BaseModule
                self::$showAll      = ($_REQUEST['show'] ?? '') === 'all';
        }
 
-       public static function post(array $parameters = [])
-       {
-               $request_id = DI::args()->get(1);
-
-               if ($request_id === 'all') {
-                       return;
-               }
-
-               if ($request_id) {
-                       $intro = DI::intro()->selectFirst(['id' => $request_id, 'uid' => local_user()]);
-
-                       switch ($_POST['submit']) {
-                               case DI::l10n()->t('Discard'):
-                                       $intro->discard();
-                                       break;
-                               case DI::l10n()->t('Ignore'):
-                                       $intro->ignore();
-                                       break;
-                       }
-
-                       DI::baseUrl()->redirect('notifications/intros');
-               }
-       }
-
        public static function rawContent(array $parameters = [])
        {
                // If the last argument of the query is NOT json, return
@@ -104,7 +101,17 @@ abstract class BaseNotifications extends BaseModule
                        return;
                }
 
-               System::jsonExit(static::getNotifications()['notifs'] ?? []);
+               // Set the pager
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
+
+               // Add additional informations (needed for json output)
+               $notifications = [
+                       'notifications' => static::getNotifications(),
+                       'items_page'    => $pager->getItemsPerPage(),
+                       'page'          => $pager->getPage(),
+               ];
+
+               System::jsonExit($notifications);
        }
 
        /**
@@ -125,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, [