X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotifications.php;h=b639b089f84fa73e8896d828e6f77c9b47fcae53;hb=303aef34f0804f9becc10610ae85985835f9d9bf;hp=bab5fd6274e4ed2c5e47cb849f1195747377beea;hpb=b9d8587f413d198b854ccb213521e47327088566;p=friendica.git

diff --git a/mod/notifications.php b/mod/notifications.php
index bab5fd6274..b639b089f8 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -1,81 +1,77 @@
 <?php
-
 /**
  * @file mod/notifications.php
  * @brief The notifications module
  */
 
-require_once("include/NotificationsManager.php");
-require_once("include/contact_selectors.php");
-require_once("include/network.php");
-
-function notifications_post(App $a) {
-
-	if (! local_user()) {
-		goaway(z_root());
+use Friendica\App;
+use Friendica\Content\ContactSelector;
+use Friendica\Content\Nav;
+use Friendica\Core\L10n;
+use Friendica\Core\NotificationsManager;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Database\DBM;
+
+function notifications_post(App $a)
+{
+	if (!local_user()) {
+		goaway(System::baseUrl());
 	}
 
 	$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
 
-	if($request_id === "all")
+	if ($request_id === "all") {
 		return;
+	}
 
-	if($request_id) {
-
-		$r = q("SELECT * FROM `intro` WHERE `id` = %d  AND `uid` = %d LIMIT 1",
-			intval($request_id),
-			intval(local_user())
-		);
+	if ($request_id) {
+		$intro = DBA::selectFirst('intro', ['id', 'contact-id', 'fid'], ['id' => $request_id, 'uid' => local_user()]);
 
-		if (dbm::is_result($r)) {
-			$intro_id = $r[0]['id'];
-			$contact_id = $r[0]['contact-id'];
-		}
-		else {
-			notice( t('Invalid request identifier.') . EOL);
+		if (DBM::is_result($intro)) {
+			$intro_id = $intro['id'];
+			$contact_id = $intro['contact-id'];
+		} else {
+			notice(L10n::t('Invalid request identifier.') . EOL);
 			return;
 		}
 
 		// If it is a friend suggestion, the contact is not a new friend but an existing friend
 		// that should not be deleted.
 
-		$fid = $r[0]['fid'];
+		$fid = $intro['fid'];
 
-		if($_POST['submit'] == t('Discard')) {
-			$r = q("DELETE FROM `intro` WHERE `id` = %d",
-				intval($intro_id)
-			);
-			if(! $fid) {
+		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
-
-				$r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1",
-					intval($contact_id),
-					intval(local_user())
-				);
+				$condition = ['id' => $contact_id, 'uid' => local_user(),
+					'self' => false, 'blocked' => true, 'pending' => true];
+				DBA::delete('contact', $condition);
 			}
 			goaway('notifications/intros');
 		}
-		if($_POST['submit'] == t('Ignore')) {
-			$r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d",
-				intval($intro_id));
+
+		if ($_POST['submit'] == L10n::t('Ignore')) {
+			DBA::update('intro', ['ignore' => true], ['id' => $intro_id]);
 			goaway('notifications/intros');
 		}
 	}
 }
 
-function notifications_content(App $a) {
-
-	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
+function notifications_content(App $a)
+{
+	if (!local_user()) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
 	$page	=	(x($_REQUEST,'page')		? $_REQUEST['page']		: 1);
 	$show	=	(x($_REQUEST,'show')		? $_REQUEST['show']		: 0);
 
-	nav_set_selected('notifications');
+	Nav::setSelected('notifications');
 
 	$json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false);
 
@@ -84,50 +80,46 @@ function notifications_content(App $a) {
 	$o = '';
 	// Get the nav tabs for the notification pages
 	$tabs = $nm->getTabs();
-	$notif_content = array();
+	$notif_content = [];
+	$notif_nocontent = '';
 
 	// Notification results per page
 	$perpage = 20;
 	$startrec = ($page * $perpage) - $perpage;
 
 	// Get introductions
-	if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
-		nav_set_selected('introductions');
-		$notif_header = t('Notifications');
+	if ((($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
+		Nav::setSelected('introductions');
+		$notif_header = L10n::t('Notifications');
 
 		$all = (($a->argc > 2) && ($a->argv[2] == 'all'));
 
 		$notifs = $nm->introNotifs($all, $startrec, $perpage);
 
 	// Get the network notifications
-	} else if (($a->argc > 1) && ($a->argv[1] == 'network')) {
-
-		$notif_header = t('Network Notifications');
+	} elseif (($a->argc > 1) && ($a->argv[1] == 'network')) {
+		$notif_header = L10n::t('Network Notifications');
 		$notifs = $nm->networkNotifs($show, $startrec, $perpage);
 
 	// Get the system notifications
-	} else if (($a->argc > 1) && ($a->argv[1] == 'system')) {
-
-		$notif_header = t('System Notifications');
+	} elseif (($a->argc > 1) && ($a->argv[1] == 'system')) {
+		$notif_header = L10n::t('System Notifications');
 		$notifs = $nm->systemNotifs($show, $startrec, $perpage);
 
 	// Get the personal notifications
-	} else if (($a->argc > 1) && ($a->argv[1] == 'personal')) {
-
-		$notif_header = t('Personal Notifications');
+	} elseif (($a->argc > 1) && ($a->argv[1] == 'personal')) {
+		$notif_header = L10n::t('Personal Notifications');
 		$notifs = $nm->personalNotifs($show, $startrec, $perpage);
 
 	// Get the home notifications
-	} else if (($a->argc > 1) && ($a->argv[1] == 'home')) {
-
-		$notif_header = t('Home Notifications');
+	} elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
+		$notif_header = L10n::t('Home Notifications');
 		$notifs = $nm->homeNotifs($show, $startrec, $perpage);
 
 	}
 
 
 	// Set the pager
-	$a->set_pager_total($notifs['total']);
 	$a->set_pager_itemspage($perpage);
 
 	// Add additional informations (needed for json output)
@@ -135,22 +127,22 @@ function notifications_content(App $a) {
 	$notifs['page'] = $a->pager['page'];
 
 	// Json output
-	if(intval($json) === 1)
-		json_return_and_die($notifs);
+	if (intval($json) === 1) {
+		System::jsonExit($notifs);
+	}
 
 	$notif_tpl = get_markup_template('notifications.tpl');
 
 	// Process the data for template creation
-	if($notifs['ident'] === 'introductions') {
-
+	if ($notifs['ident'] === 'introductions') {
 		$sugg = get_markup_template('suggestions.tpl');
 		$tpl = get_markup_template("intros.tpl");
 
 		// The link to switch between ignored and normal connection requests
-		$notif_show_lnk = array(
+		$notif_show_lnk = [
 			'href' => (!$all ? 'notifications/intros/all' : 'notifications/intros' ),
-			'text' => (!$all ? t('Show Ignored Requests') : t('Hide Ignored Requests'))
-		);
+			'text' => (!$all ? L10n::t('Show Ignored Requests') : L10n::t('Hide Ignored Requests'))
+		];
 
 		// Loop through all introduction notifications.This creates an array with the output html for each
 		// introduction
@@ -160,25 +152,32 @@ function notifications_content(App $a) {
 			// We have to distinguish between these two because they use different data.
 			switch ($it['label']) {
 				case 'friend_suggestion':
-					$notif_content[] = replace_macros($sugg, array(
-						'$str_notifytype' => t('Notification type: '),
+					$notif_content[] = replace_macros($sugg, [
+						'$type' => $it['label'],
+						'$str_notifytype' => L10n::t('Notification type:'),
 						'$notify_type' => $it['notify_type'],
 						'$intro_id' => $it['intro_id'],
-						'$madeby' => sprintf( t('suggested by %s'),$it['madeby']),
-						'$contact_id' => $it['contact-id'],
+						'$lbl_madeby' => L10n::t('Suggested by:'),
+						'$madeby' => $it['madeby'],
+						'$madeby_url' => $it['madeby_url'],
+						'$madeby_zrl' => $it['madeby_zrl'],
+						'$madeby_addr' => $it['madeby_addr'],
+						'$contact_id' => $it['contact_id'],
 						'$photo' => $it['photo'],
 						'$fullname' => $it['name'],
 						'$url' => $it['url'],
-						'$hidden' => array('hidden', t('Hide this contact from others'), ($it['hidden'] == 1), ''),
-						'$activity' => array('activity', t('Post a new friend activity'), $it['post_newfriend'], t('if applicable')),
+						'$zrl' => $it['zrl'],
+						'$lbl_url' => L10n::t('Profile URL'),
+						'$addr' => $it['addr'],
+						'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''],
 
 						'$knowyou' => $it['knowyou'],
-						'$approve' => t('Approve'),
+						'$approve' => L10n::t('Approve'),
 						'$note' => $it['note'],
 						'$request' => $it['request'],
-						'$ignore' => t('Ignore'),
-						'$discard' => t('Discard'),
-					));
+						'$ignore' => L10n::t('Ignore'),
+						'$discard' => L10n::t('Discard'),
+					]);
 					break;
 
 				// Normal connection requests
@@ -188,44 +187,56 @@ function notifications_content(App $a) {
 					$dfrn_tpl = get_markup_template('netfriend.tpl');
 
 					$knowyou   = '';
+					$lbl_knowyou = '';
 					$dfrn_text = '';
-
-					if($it['network'] === NETWORK_DFRN || $it['network'] === NETWORK_DIASPORA) {
-						if($it['network'] === NETWORK_DFRN) {
-							$lbl_knowyou = t('Claims to be known to you: ');
-							$knowyou = (($it['knowyou']) ? t('yes') : t('no'));
-							$helptext = t('Shall your connection be bidirectional or not?');
-							$helptext2 = sprintf(t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.'), $it['name'], $it['name']);
-							$helptext3 = sprintf(t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.'), $it['name']);
+					$helptext = '';
+					$helptext2 = '';
+					$helptext3 = '';
+
+					if ($it['network'] === NETWORK_DFRN || $it['network'] === NETWORK_DIASPORA) {
+						if ($it['network'] === NETWORK_DFRN) {
+							$lbl_knowyou = L10n::t('Claims to be known to you: ');
+							$knowyou = (($it['knowyou']) ? L10n::t('yes') : L10n::t('no'));
+							$helptext = L10n::t('Shall your connection be bidirectional or not?');
+							$helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $it['name'], $it['name']);
+							$helptext3 = L10n::t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $it['name']);
 						} else {
 							$knowyou = '';
-							$helptext = t('Shall your connection be bidirectional or not?');
-							$helptext2 = sprintf(t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.'), $it['name'], $it['name']);
-							$helptext3 = sprintf(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.'), $it['name']);
+							$helptext = L10n::t('Shall your connection be bidirectional or not?');
+							$helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $it['name'], $it['name']);
+							$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.', $it['name']);
 						}
 					}
 
-					$dfrn_text = replace_macros($dfrn_tpl,array(
+					$dfrn_text = replace_macros($dfrn_tpl,[
 						'$intro_id' => $it['intro_id'],
 						'$friend_selected' => $friend_selected,
 						'$fan_selected' => $fan_selected,
 						'$approve_as1' => $helptext,
 						'$approve_as2' => $helptext2,
 						'$approve_as3' => $helptext3,
-						'$as_friend' => t('Friend'),
-						'$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Subscriber'))
-					));
+						'$as_friend' => L10n::t('Friend'),
+						'$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
+					]);
 
 					$header = $it["name"];
 
-					if ($it["addr"] != "")
+					if ($it["addr"] != "") {
 						$header .= " <".$it["addr"].">";
+					}
 
-					$header .= " (".network_to_name($it['network'], $it['url']).")";
+					$header .= " (".ContactSelector::networkToName($it['network'], $it['url']).")";
 
-					$notif_content[] = replace_macros($tpl, array(
+					if ($it['network'] != NETWORK_DIASPORA) {
+						$discard = L10n::t('Discard');
+					} else {
+						$discard = '';
+					}
+
+					$notif_content[] = replace_macros($tpl, [
+						'$type' => $it['label'],
 						'$header' => htmlentities($header),
-						'$str_notifytype' => t('Notification type: '),
+						'$str_notifytype' => L10n::t('Notification type:'),
 						'$notify_type' => $it['notify_type'],
 						'$dfrn_text' => $dfrn_text,
 						'$dfrn_id' => $it['dfrn_id'],
@@ -235,39 +246,38 @@ function notifications_content(App $a) {
 						'$photo' => $it['photo'],
 						'$fullname' => $it['name'],
 						'$location' => $it['location'],
-						'$lbl_location' => t('Location:'),
+						'$lbl_location' => L10n::t('Location:'),
 						'$about' => $it['about'],
-						'$lbl_about' => t('About:'),
+						'$lbl_about' => L10n::t('About:'),
 						'$keywords' => $it['keywords'],
-						'$lbl_keywords' => t('Tags:'),
+						'$lbl_keywords' => L10n::t('Tags:'),
 						'$gender' => $it['gender'],
-						'$lbl_gender' => t('Gender:'),
-						'$hidden' => array('hidden', t('Hide this contact from others'), ($it['hidden'] == 1), ''),
-						'$activity' => array('activity', t('Post a new friend activity'), $it['post_newfriend'], t('if applicable')),
+						'$lbl_gender' => L10n::t('Gender:'),
+						'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''],
 						'$url' => $it['url'],
 						'$zrl' => $it['zrl'],
-						'$lbl_url' => t('Profile URL'),
+						'$lbl_url' => L10n::t('Profile URL'),
 						'$addr' => $it['addr'],
 						'$lbl_knowyou' => $lbl_knowyou,
-						'$lbl_network' => t('Network:'),
-						'$network' => network_to_name($it['network'], $it['url']),
+						'$lbl_network' => L10n::t('Network:'),
+						'$network' => ContactSelector::networkToName($it['network'], $it['url']),
 						'$knowyou' => $knowyou,
-						'$approve' => t('Approve'),
+						'$approve' => L10n::t('Approve'),
 						'$note' => $it['note'],
-						'$ignore' => t('Ignore'),
-						'$discard' => t('Discard'),
+						'$ignore' => L10n::t('Ignore'),
+						'$discard' => $discard,
 
-					));
+					]);
 					break;
 			}
 		}
 
-		if($notifs['total'] == 0)
-			info( t('No introductions.') . EOL);
+		if (count($notifs['notifications']) == 0) {
+			info(L10n::t('No introductions.') . EOL);
+		}
 
 	// Normal notifications (no introductions)
 	} else {
-
 		// The template files we need in different cases for formatting the content
 		$tpl_item_like = 'notifications_likes_item.tpl';
 		$tpl_item_dislike = 'notifications_dislikes_item.tpl';
@@ -287,7 +297,7 @@ function notifications_content(App $a) {
 			$tpl_var_name = 'tpl_item_'.$it['label'];
 			$tpl_notif = get_markup_template($$tpl_var_name);
 
-			$notif_content[] = replace_macros($tpl_notif,array(
+			$notif_content[] = replace_macros($tpl_notif,[
 				'$item_label' => $it['label'],
 				'$item_link' => $it['link'],
 				'$item_image' => $it['image'],
@@ -296,31 +306,28 @@ function notifications_content(App $a) {
 				'$item_when' => $it['when'],
 				'$item_ago' => $it['ago'],
 				'$item_seen' => $it['seen'],
-			));
+			]);
 		}
 
-		// It doesn't make sense to show the Show unread / Show all link visible if the user is on the
-		// "Show all" page and there are no notifications. So we will hide it.
-		if($show == 0 || intval($show) && $notifs['total'] > 0) {
-			$notif_show_lnk = array(
-				'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
-				'text' => ($show ? t('Show unread') : t('Show all')),
-			);
-		}
+		$notif_show_lnk = [
+			'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
+			'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
+		];
 
 		// Output if there aren't any notifications available
-		if($notifs['total'] == 0)
-			$notif_nocontent = sprintf( t('No more %s notifications.'), $notifs['ident']);
+		if (count($notifs['notifications']) == 0) {
+			$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
+		}
 	}
 
-	$o .= replace_macros($notif_tpl, array(
+	$o .= replace_macros($notif_tpl, [
 		'$notif_header' => $notif_header,
 		'$tabs' => $tabs,
 		'$notif_content' => $notif_content,
 		'$notif_nocontent' => $notif_nocontent,
 		'$notif_show_lnk' => $notif_show_lnk,
-		'$notif_paginate' => paginate($a)
-	));
+		'$notif_paginate' => alt_pager($a, count($notif_content))
+	]);
 
 	return $o;
 }