X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotifications.php;h=909b297ebfbe992c92e01cc46cff10a03c435e72;hb=6c341962648b73c935c2de26996b07332b776a1f;hp=212736305f81e57433df433538b894de73ce1096;hpb=f85af78097d2ab73a9ee4b020a6a366f3a147de3;p=friendica.git

diff --git a/mod/notifications.php b/mod/notifications.php
index 212736305f..909b297ebf 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -7,16 +7,19 @@
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
+use Friendica\Content\Pager;
 use Friendica\Core\L10n;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Module\Login;
 
 function notifications_post(App $a)
 {
 	if (!local_user()) {
-		goaway(System::baseUrl());
+		$a->internalRedirect();
 	}
 
 	$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
@@ -51,12 +54,12 @@ function notifications_post(App $a)
 					'self' => false, 'blocked' => true, 'pending' => true];
 				DBA::delete('contact', $condition);
 			}
-			goaway('notifications/intros');
+			$a->internalRedirect('notifications/intros');
 		}
 
 		if ($_POST['submit'] == L10n::t('Ignore')) {
 			DBA::update('intro', ['ignore' => true], ['id' => $intro_id]);
-			goaway('notifications/intros');
+			$a->internalRedirect('notifications/intros');
 		}
 	}
 }
@@ -65,7 +68,7 @@ function notifications_content(App $a)
 {
 	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
-		return;
+		return Login::form();
 	}
 
 	$page = defaults($_REQUEST, 'page', 1);
@@ -89,6 +92,8 @@ function notifications_content(App $a)
 
 	$notif_header = L10n::t('Notifications');
 
+	$all = false;
+
 	// Get introductions
 	if ((($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
 		Nav::setSelected('introductions');
@@ -119,23 +124,28 @@ function notifications_content(App $a)
 	}
 
 	// Set the pager
-	$a->set_pager_itemspage($perpage);
+	$pager = new Pager($a->query_string, $perpage);
 
 	// Add additional informations (needed for json output)
-	$notifs['items_page'] = $a->pager['itemspage'];
-	$notifs['page'] = $a->pager['page'];
+	$notifs['items_page'] = $pager->getItemsPerPage();
+	$notifs['page'] = $pager->getPage();
 
 	// Json output
 	if (intval($json) === 1) {
 		System::jsonExit($notifs);
 	}
 
-	$notif_tpl = get_markup_template('notifications.tpl');
+	$notif_tpl = Renderer::getMarkupTemplate('notifications.tpl');
+
+	$notif_show_lnk = [
+		'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ),
+		'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
+	];
 
 	// Process the data for template creation
 	if (defaults($notifs, 'ident', '') === 'introductions') {
-		$sugg = get_markup_template('suggestions.tpl');
-		$tpl = get_markup_template('intros.tpl');
+		$sugg = Renderer::getMarkupTemplate('suggestions.tpl');
+		$tpl = Renderer::getMarkupTemplate('intros.tpl');
 
 		// The link to switch between ignored and normal connection requests
 		$notif_show_lnk = [
@@ -151,7 +161,7 @@ function notifications_content(App $a)
 			// We have to distinguish between these two because they use different data.
 			switch ($notif['label']) {
 				case 'friend_suggestion':
-					$notif_content[] = replace_macros($sugg, [
+					$notif_content[] = Renderer::replaceMacros($sugg, [
 						'$type'       => $notif['label'],
 						'$str_notifytype' => L10n::t('Notification type:'),
 						'$notify_type'=> $notif['notify_type'],
@@ -201,8 +211,8 @@ function notifications_content(App $a)
 						$helptext3 = L10n::t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']);
 					}
 
-					$dfrn_tpl = get_markup_template('netfriend.tpl');
-					$dfrn_text = replace_macros($dfrn_tpl, [
+					$dfrn_tpl = Renderer::getMarkupTemplate('netfriend.tpl');
+					$dfrn_text = Renderer::replaceMacros($dfrn_tpl, [
 						'$intro_id'    => $notif['intro_id'],
 						'$friend_selected' => $friend_selected,
 						'$fan_selected'=> $fan_selected,
@@ -227,9 +237,9 @@ function notifications_content(App $a)
 						$discard = '';
 					}
 
-					$notif_content[] = replace_macros($tpl, [
+					$notif_content[] = Renderer::replaceMacros($tpl, [
 						'$type'        => $notif['label'],
-						'$header'      => htmlentities($header),
+						'$header'      => $header,
 						'$str_notifytype' => L10n::t('Notification type:'),
 						'$notify_type' => $notif['notify_type'],
 						'$dfrn_text'   => $dfrn_text,
@@ -274,11 +284,21 @@ function notifications_content(App $a)
 		// Loop trough ever notification This creates an array with the output html for each
 		// notification and apply the correct template according to the notificationtype (label).
 		foreach ($notifs['notifications'] as $notif) {
-			// We use the notification label to get the correct template file
-			$tpl_var_name = 'tpl_item_' . $notif['label'];
-			$tpl_notif = get_markup_template($$tpl_var_name);
-
-			$notif_content[] = replace_macros($tpl_notif, [
+			$notification_templates = [
+				'like'        => 'notifications_likes_item.tpl',
+				'dislike'     => 'notifications_dislikes_item.tpl',
+				'attend'      => 'notifications_attend_item.tpl',
+				'attendno'    => 'notifications_attend_item.tpl',
+				'attendmaybe' => 'notifications_attend_item.tpl',
+				'friend'      => 'notifications_friends_item.tpl',
+				'comment'     => 'notifications_comments_item.tpl',
+				'post'        => 'notifications_posts_item.tpl',
+				'notify'      => 'notify.tpl',
+			];
+
+			$tpl_notif = Renderer::getMarkupTemplate($notification_templates[$notif['label']]);
+
+			$notif_content[] = Renderer::replaceMacros($tpl_notif, [
 				'$item_label' => $notif['label'],
 				'$item_link'  => $notif['link'],
 				'$item_image' => $notif['image'],
@@ -293,18 +313,13 @@ function notifications_content(App $a)
 		$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
 	}
 
-	$notif_show_lnk = [
-		'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ),
-		'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
-	];
-
-	$o .= replace_macros($notif_tpl, [
+	$o .= Renderer::replaceMacros($notif_tpl, [
 		'$notif_header'    => $notif_header,
 		'$tabs'            => $tabs,
 		'$notif_content'   => $notif_content,
 		'$notif_nocontent' => $notif_nocontent,
 		'$notif_show_lnk'  => $notif_show_lnk,
-		'$notif_paginate'  => alt_pager($a, count($notif_content))
+		'$notif_paginate'  => $pager->renderMinimal(count($notif_content))
 	]);
 
 	return $o;