X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotifications.php;h=f44007ce3105160eaaab5e65ea5494aa26889ce5;hb=11cf36105ccd359c9d21a006e13b3767712196b6;hp=fdaec05ccd2449a5916b593906da4bebf754f2bc;hpb=0135b7e357064f5fc6e0983991e297b729b6f87a;p=friendica.git

diff --git a/mod/notifications.php b/mod/notifications.php
index fdaec05ccd..f44007ce31 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -1,18 +1,21 @@
 <?php
-
 /**
  * @file mod/notifications.php
  * @brief The notifications module
  */
+use Friendica\App;
+use Friendica\Content\ContactSelector;
+use Friendica\Content\Nav;
+use Friendica\Core\NotificationsManager;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 
-require_once("include/NotificationsManager.php");
-require_once("include/contact_selectors.php");
-require_once("include/network.php");
+require_once "include/network.php";
 
 function notifications_post(App $a) {
 
 	if (! local_user()) {
-		goaway(z_root());
+		goaway(System::baseUrl());
 	}
 
 	$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
@@ -27,7 +30,7 @@ function notifications_post(App $a) {
 			intval(local_user())
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$intro_id = $r[0]['id'];
 			$contact_id = $r[0]['contact-id'];
 		}
@@ -75,7 +78,7 @@ function notifications_content(App $a) {
 	$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,15 +87,15 @@ function notifications_content(App $a) {
 	$o = '';
 	// Get the nav tabs for the notification pages
 	$tabs = $nm->getTabs();
-	$notif_content = array();
+	$notif_content = [];
 
 	// 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');
+	if ((($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
+		Nav::setSelected('introductions');
 		$notif_header = t('Notifications');
 
 		$all = (($a->argc > 2) && ($a->argv[2] == 'all'));
@@ -147,10 +150,10 @@ function notifications_content(App $a) {
 		$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'))
-		);
+		];
 
 		// Loop through all introduction notifications.This creates an array with the output html for each
 		// introduction
@@ -160,7 +163,7 @@ 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(
+					$notif_content[] = replace_macros($sugg, [
 						'$str_notifytype' => t('Notification type: '),
 						'$notify_type' => $it['notify_type'],
 						'$intro_id' => $it['intro_id'],
@@ -169,8 +172,8 @@ function notifications_content(App $a) {
 						'$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')),
+						'$hidden' => ['hidden', t('Hide this contact from others'), ($it['hidden'] == 1), ''],
+						'$activity' => ['activity', t('Post a new friend activity'), $it['post_newfriend'], t('if applicable')],
 
 						'$knowyou' => $it['knowyou'],
 						'$approve' => t('Approve'),
@@ -178,7 +181,7 @@ function notifications_content(App $a) {
 						'$request' => $it['request'],
 						'$ignore' => t('Ignore'),
 						'$discard' => t('Discard'),
-					));
+					]);
 					break;
 
 				// Normal connection requests
@@ -205,7 +208,7 @@ function notifications_content(App $a) {
 						}
 					}
 
-					$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,
@@ -214,14 +217,14 @@ function notifications_content(App $a) {
 						'$approve_as3' => $helptext3,
 						'$as_friend' => t('Friend'),
 						'$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Subscriber'))
-					));
+					]);
 
 					$header = $it["name"];
 
 					if ($it["addr"] != "")
 						$header .= " <".$it["addr"].">";
 
-					$header .= " (".network_to_name($it['network'], $it['url']).")";
+					$header .= " (".ContactSelector::networkToName($it['network'], $it['url']).")";
 
 					if ($it['network'] != NETWORK_DIASPORA) {
 						$discard = t('Discard');
@@ -229,7 +232,7 @@ function notifications_content(App $a) {
 						$discard = '';
 					}
 
-					$notif_content[] = replace_macros($tpl, array(
+					$notif_content[] = replace_macros($tpl, [
 						'$header' => htmlentities($header),
 						'$str_notifytype' => t('Notification type: '),
 						'$notify_type' => $it['notify_type'],
@@ -248,22 +251,22 @@ function notifications_content(App $a) {
 						'$lbl_keywords' => 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')),
+						'$hidden' => ['hidden', t('Hide this contact from others'), ($it['hidden'] == 1), ''],
+						'$activity' => ['activity', t('Post a new friend activity'), $it['post_newfriend'], t('if applicable')],
 						'$url' => $it['url'],
 						'$zrl' => $it['zrl'],
 						'$lbl_url' => t('Profile URL'),
 						'$addr' => $it['addr'],
 						'$lbl_knowyou' => $lbl_knowyou,
 						'$lbl_network' => t('Network:'),
-						'$network' => network_to_name($it['network'], $it['url']),
+						'$network' => ContactSelector::networkToName($it['network'], $it['url']),
 						'$knowyou' => $knowyou,
 						'$approve' => t('Approve'),
 						'$note' => $it['note'],
 						'$ignore' => t('Ignore'),
 						'$discard' => $discard,
 
-					));
+					]);
 					break;
 			}
 		}
@@ -293,7 +296,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'],
@@ -302,16 +305,16 @@ 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(
+			$notif_show_lnk = [
 				'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
 				'text' => ($show ? t('Show unread') : t('Show all')),
-			);
+			];
 		}
 
 		// Output if there aren't any notifications available
@@ -319,14 +322,14 @@ function notifications_content(App $a) {
 			$notif_nocontent = sprintf( 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)
-	));
+	]);
 
 	return $o;
 }