X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotifications.php;h=88972728cb7ca63b213700997efc2adc9542b3ab;hb=b543ee8ac78168328c7a7f2d725ee01bb333e941;hp=3934a32357b5c9989ab355bb9a237de758e53f6a;hpb=8dc5b04be7cd9cb2eb77ed9824815efe27369bee;p=friendica.git

diff --git a/mod/notifications.php b/mod/notifications.php
index 3934a32357..88972728cb 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -7,16 +7,20 @@
 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;
+use Friendica\Model\Contact;
+use Friendica\Model\Notify;
 
 function notifications_post(App $a)
 {
 	if (!local_user()) {
-		goaway(System::baseUrl());
+		$a->internalRedirect();
 	}
 
 	$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
@@ -43,20 +47,25 @@ function notifications_post(App $a)
 
 		if ($_POST['submit'] == L10n::t('Discard')) {
 			DBA::delete('intro', ['id' => $intro_id]);
-
 			if (!$fid) {
-				// The check for blocked and pending is in case the friendship was already approved
-				// and we just want to get rid of the now pointless notification
+				// When the contact entry had been created just for that intro, we want to get rid of it now
 				$condition = ['id' => $contact_id, 'uid' => local_user(),
-					'self' => false, 'blocked' => true, 'pending' => true];
-				DBA::delete('contact', $condition);
+					'self' => false, 'pending' => true, 'rel' => [0, Contact::FOLLOWER]];
+				$contact_pending = DBA::exists('contact', $condition);
+
+				// Remove the "pending" to stop the reappearing in any case
+				DBA::update('contact', ['pending' => false], ['id' => $contact_id]);
+
+				if ($contact_pending) {
+					Contact::remove($contact_id);
+				}
 			}
-			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,17 +74,18 @@ function notifications_content(App $a)
 {
 	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
-		return;
+		return Login::form();
 	}
 
-	$page = defaults($_REQUEST, 'page', 1);
-	$show = defaults($_REQUEST, 'show', 0);
+	$page = ($_REQUEST['page'] ?? 0) ?: 1;
+	$show = ($_REQUEST['show'] ?? '') === 'all';
 
 	Nav::setSelected('notifications');
 
 	$json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false);
 
-	$nm = new NotificationsManager();
+	/** @var Notify $nm */
+	$nm = \Friendica\BaseObject::getClass(Notify::class);
 
 	$o = '';
 	// Get the nav tabs for the notification pages
@@ -89,48 +99,58 @@ 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');
 
+		$id = 0;
+		if (!empty($a->argv[2]) && intval($a->argv[2]) != 0) {
+			$id = (int)$a->argv[2];
+		}
+
 		$all = (($a->argc > 2) && ($a->argv[2] == 'all'));
 
-		$notifs = $nm->introNotifs($all, $startrec, $perpage);
+		$notifs = $nm->getIntroList($all, $startrec, $perpage, $id);
 
 	// Get the network notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'network')) {
 		$notif_header = L10n::t('Network Notifications');
-		$notifs = $nm->networkNotifs($show, $startrec, $perpage);
+		$notifs = $nm->getNetworkList($show, $startrec, $perpage);
 
 	// Get the system notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'system')) {
 		$notif_header = L10n::t('System Notifications');
-		$notifs = $nm->systemNotifs($show, $startrec, $perpage);
+		$notifs = $nm->getSystemList($show, $startrec, $perpage);
 
 	// Get the personal notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'personal')) {
 		$notif_header = L10n::t('Personal Notifications');
-		$notifs = $nm->personalNotifs($show, $startrec, $perpage);
+		$notifs = $nm->getPersonalList($show, $startrec, $perpage);
 
 	// Get the home notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
 		$notif_header = L10n::t('Home Notifications');
-		$notifs = $nm->homeNotifs($show, $startrec, $perpage);
+		$notifs = $nm->getHomeList($show, $startrec, $perpage);
+	// fallback - redirect to main page
+	} else {
+		$a->internalRedirect('notifications');
 	}
 
 	// 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' ),
@@ -138,9 +158,9 @@ function notifications_content(App $a)
 	];
 
 	// Process the data for template creation
-	if (defaults($notifs, 'ident', '') === 'introductions') {
-		$sugg = get_markup_template('suggestions.tpl');
-		$tpl = get_markup_template('intros.tpl');
+	if (($notifs['ident'] ?? '') == 'introductions') {
+		$sugg = Renderer::getMarkupTemplate('suggestions.tpl');
+		$tpl = Renderer::getMarkupTemplate('intros.tpl');
 
 		// The link to switch between ignored and normal connection requests
 		$notif_show_lnk = [
@@ -156,7 +176,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'],
@@ -206,8 +226,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,
@@ -218,6 +238,14 @@ function notifications_content(App $a)
 						'$as_fan'      => (($notif['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
 					]);
 
+					$contact = DBA::selectFirst('contact', ['network', 'protocol'], ['id' => $notif['contact_id']]);
+
+					if (($contact['network'] != Protocol::DFRN) || ($contact['protocol'] == Protocol::ACTIVITYPUB)) {
+						$action = 'follow_confirm';
+					} else {
+						$action = 'dfrn_confirm';
+					}
+
 					$header = $notif['name'];
 
 					if ($notif['addr'] != '') {
@@ -232,9 +260,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,
@@ -265,6 +293,7 @@ function notifications_content(App $a)
 						'$note'        => $notif['note'],
 						'$ignore'      => L10n::t('Ignore'),
 						'$discard'     => $discard,
+						'$action'      => $action,
 					]);
 					break;
 			}
@@ -291,9 +320,9 @@ function notifications_content(App $a)
 				'notify'      => 'notify.tpl',
 			];
 
-			$tpl_notif = get_markup_template($notification_templates[$notif['label']]);
+			$tpl_notif = Renderer::getMarkupTemplate($notification_templates[$notif['label']]);
 
-			$notif_content[] = replace_macros($tpl_notif, [
+			$notif_content[] = Renderer::replaceMacros($tpl_notif, [
 				'$item_label' => $notif['label'],
 				'$item_link'  => $notif['link'],
 				'$item_image' => $notif['image'],
@@ -308,13 +337,13 @@ function notifications_content(App $a)
 		$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
 	}
 
-	$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;