X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModule%2FBaseNotifications.php;h=45975672b48494410e39514dfdf1bc7bc114db5e;hb=a63dc7a3d8378480b915fc9aebd14e9115512df0;hp=8a569e24f16f0295950f778e2d6ec71bc51d10bc;hpb=14988ddf19f5baabef0989f3b888b2200f8e4c9e;p=friendica.git

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index 8a569e24f1..45975672b4 100644
--- 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-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,14 +22,18 @@
 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\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
-use Friendica\Navigation\Notifications\ValueObject\FormattedNotification;
+use Friendica\Navigation\Notifications\ValueObject\FormattedNotify;
 use Friendica\Network\HTTPException\ForbiddenException;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  * Base Module for each tab of the notification display
@@ -40,29 +44,29 @@ abstract class BaseNotifications extends BaseModule
 {
 	/** @var array Array of URL parameters */
 	const URL_TYPES = [
-		FormattedNotification::NETWORK  => 'network',
-		FormattedNotification::SYSTEM   => 'system',
-		FormattedNotification::HOME     => 'home',
-		FormattedNotification::PERSONAL => 'personal',
-		FormattedNotification::INTRO    => 'intros',
+		FormattedNotify::NETWORK  => 'network',
+		FormattedNotify::SYSTEM   => 'system',
+		FormattedNotify::HOME     => 'home',
+		FormattedNotify::PERSONAL => 'personal',
+		FormattedNotify::INTRO    => 'intros',
 	];
 
 	/** @var array Array of the allowed notifications and their printable name */
 	const PRINT_TYPES = [
-		FormattedNotification::NETWORK  => 'Network',
-		FormattedNotification::SYSTEM   => 'System',
-		FormattedNotification::HOME     => 'Home',
-		FormattedNotification::PERSONAL => 'Personal',
-		FormattedNotification::INTRO    => 'Introductions',
+		FormattedNotify::NETWORK  => 'Network',
+		FormattedNotify::SYSTEM   => 'System',
+		FormattedNotify::HOME     => 'Home',
+		FormattedNotify::PERSONAL => 'Personal',
+		FormattedNotify::INTRO    => 'Introductions',
 	];
 
 	/** @var array The array of access keys for notification pages */
 	const ACCESS_KEYS = [
-		FormattedNotification::NETWORK  => 'w',
-		FormattedNotification::SYSTEM   => 'y',
-		FormattedNotification::HOME     => 'h',
-		FormattedNotification::PERSONAL => 'r',
-		FormattedNotification::INTRO    => 'i',
+		FormattedNotify::NETWORK  => 'w',
+		FormattedNotify::SYSTEM   => 'y',
+		FormattedNotify::HOME     => 'h',
+		FormattedNotify::PERSONAL => 'r',
+		FormattedNotify::INTRO    => 'i',
 	];
 
 	/** @var int The default count of items per page */
@@ -86,23 +90,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, IHandleUserSessions $session, 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.'));
+		if (!$session->getLocalUserId()) {
+			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 +146,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 +169,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',