X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FBaseNotifications.php;h=4715641c2f59233258c583eb76efea50de60d85e;hb=06a18abf5a746232c99b5271d907687b30e72651;hp=2133a3b880701b8337563f4cc62b574e6c384eb3;hpb=0f932ae723c8b97a1889b9d77a52da3fe7f8b2b3;p=friendica.git

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index 2133a3b880..4715641c2f 100644
--- 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
@@ -27,7 +46,7 @@ abstract class BaseNotifications extends BaseModule
 		Notification::INTRO    => 'intros',
 	];
 
-	/** @var array Array of the allowed notifies and their printable name */
+	/** @var array Array of the allowed notifications and their printable name */
 	const PRINT_TYPES = [
 		Notification::NETWORK  => 'Network',
 		Notification::SYSTEM   => 'System',
@@ -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,37 +101,47 @@ 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);
 	}
 
 	/**
 	 * Shows the printable result of notifications for a specific tab
 	 *
-	 * @param string $header    The notification header
-	 * @param array  $content   The array with the notifications
-	 * @param string $noContent The string in case there are no notifications
-	 * @param array  $showLink  The possible links at the top
+	 * @param string $header        The notification header
+	 * @param array  $notifications The array with the notifications
+	 * @param string $noContent     The string in case there are no notifications
+	 * @param array  $showLink      The possible links at the top
 	 *
 	 * @return string The rendered output
 	 *
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	protected static function printContent(string $header, array $content, string $noContent, array $showLink)
+	protected static function printContent(string $header, array $notifications, string $noContent, array $showLink)
 	{
 		// Get the nav tabs for the notification pages
 		$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, [
-			'$notif_header'    => $header ?? DI::l10n()->t('Notifications'),
-			'$tabs'            => $tabs,
-			'$notif_content'   => $content,
-			'$notif_nocontent' => $noContent,
-			'$notif_show_lnk'  => $showLink,
-			'$notif_paginate'  => $pager->renderMinimal(count($content))
+			'$header'        => $header ?? DI::l10n()->t('Notifications'),
+			'$tabs'          => $tabs,
+			'$notifications' => $notifications,
+			'$noContent'     => $noContent,
+			'$showLink'      => $showLink,
+			'$paginate'      => $pager->renderMinimal(count($notifications))
 		]);
 	}