X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdisplay.php;h=62e180874d1c60b6d61f19cd7516fda6688a719e;hb=f826ce70ceb9f810a16b70d3d77b9ba2c8d9097d;hp=c1b7746e24c5ee3d655af158d05a723b91be8c35;hpb=d8fe8b1e8b008ee0b8d87fda7467b1d058a07e75;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index c1b7746e24..62e180874d 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -24,7 +24,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -46,14 +45,14 @@ function display_init(App $a)
 		(new Objects(DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), $_SERVER, ['guid' => DI::args()->getArgv()[1] ?? null]))->run();
 	}
 
-	if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
+	if (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) {
 		return;
 	}
 
 	$nick = ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : '');
 
 	$item = null;
-	$item_user = local_user();
+	$item_user = DI::userSession()->getLocalUserId();
 
 	$fields = ['uri-id', 'parent-uri-id', 'author-id', 'author-link', 'body', 'uid', 'guid', 'gravity'];
 
@@ -62,18 +61,18 @@ function display_init(App $a)
 		$nick = '';
 
 		// Does the local user have this item?
-		if (local_user()) {
-			$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => DI::args()->getArgv()[1], 'uid' => local_user()]);
+		if (DI::userSession()->getLocalUserId()) {
+			$item = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), $fields, ['guid' => DI::args()->getArgv()[1], 'uid' => DI::userSession()->getLocalUserId()]);
 			if (DBA::isResult($item)) {
 				$nick = $a->getLoggedInUserNickname();
 			}
 		}
 
 		// Is this item private but could be visible to the remove visitor?
-		if (!DBA::isResult($item) && remote_user()) {
+		if (!DBA::isResult($item) && DI::userSession()->getRemoteUserId()) {
 			$item = Post::selectFirst($fields, ['guid' => DI::args()->getArgv()[1], 'private' => Item::PRIVATE, 'origin' => true]);
 			if (DBA::isResult($item)) {
-				if (!Contact::isFollower(remote_user(), $item['uid'])) {
+				if (!Contact::isFollower(DI::userSession()->getRemoteUserId(), $item['uid'])) {
 					$item = null;
 				} else {
 					$item_user = $item['uid'];
@@ -83,14 +82,14 @@ function display_init(App $a)
 
 		// Is it an item with uid=0?
 		if (!DBA::isResult($item)) {
-			$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => DI::args()->getArgv()[1], 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
+			$item = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), $fields, ['guid' => DI::args()->getArgv()[1], 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
 		}
 	} elseif (DI::args()->getArgc() >= 3 && $nick == 'feed-item') {
 		$uri_id = DI::args()->getArgv()[2];
 		if (substr($uri_id, -5) == '.atom') {
 			$uri_id = substr($uri_id, 0, -5);
 		}
-		$item = Post::selectFirstForUser(local_user(), $fields, ['uri-id' => $uri_id, 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
+		$item = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), $fields, ['uri-id' => $uri_id, 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
 	}
 
 	if (!DBA::isResult($item)) {
@@ -123,11 +122,9 @@ function display_init(App $a)
 
 function display_fetchauthor($item)
 {
-	if (Diaspora::isReshare($item['body'], true)) {
-		$shared = Item::getShareArray($item);
-		if (!empty($shared['profile'])) {
-			$contact = Contact::getByURLForUser($shared['profile'], local_user());
-		}
+	$shared = DI::contentItem()->getSharedPost($item, ['author-link']);
+	if (!empty($shared) && empty($shared['comment'])) {
+		$contact = Contact::getByURLForUser($shared['post']['author-link'], DI::userSession()->getLocalUserId());
 	}
 
 	if (empty($contact)) {
@@ -139,7 +136,7 @@ function display_fetchauthor($item)
 
 function display_content(App $a, $update = false, $update_uid = 0)
 {
-	if (DI::config()->get('system','block_public') && !Session::isAuthenticated()) {
+	if (DI::config()->get('system','block_public') && !DI::userSession()->isAuthenticated()) {
 		throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
 	}
 
@@ -181,18 +178,18 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		if (DI::args()->getArgc() == 2) {
 			$fields = ['uri-id', 'parent-uri-id', 'uid'];
 
-			if (local_user()) {
-				$condition = ['guid' => DI::args()->getArgv()[1], 'uid' => [0, local_user()]];
-				$item = Post::selectFirstForUser(local_user(), $fields, $condition, ['order' => ['uid' => true]]);
+			if (DI::userSession()->getLocalUserId()) {
+				$condition = ['guid' => DI::args()->getArgv()[1], 'uid' => [0, DI::userSession()->getLocalUserId()]];
+				$item = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), $fields, $condition, ['order' => ['uid' => true]]);
 				if (DBA::isResult($item)) {
 					$uri_id = $item['uri-id'];
 					$parent_uri_id = $item['parent-uri-id'];
 				}
 			}
 
-			if (($parent_uri_id == 0) && remote_user()) {
+			if (($parent_uri_id == 0) && DI::userSession()->getRemoteUserId()) {
 				$item = Post::selectFirst($fields, ['guid' => DI::args()->getArgv()[1], 'private' => Item::PRIVATE, 'origin' => true]);
-				if (DBA::isResult($item) && Contact::isFollower(remote_user(), $item['uid'])) {
+				if (DBA::isResult($item) && Contact::isFollower(DI::userSession()->getRemoteUserId(), $item['uid'])) {
 					$uri_id = $item['uri-id'];
 					$parent_uri_id = $item['parent-uri-id'];
 				}
@@ -200,7 +197,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
 			if ($parent_uri_id == 0) {
 				$condition = ['private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => DI::args()->getArgv()[1], 'uid' => 0];
-				$item = Post::selectFirstForUser(local_user(), $fields, $condition);
+				$item = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), $fields, $condition);
 				if (DBA::isResult($item)) {
 					$uri_id = $item['uri-id'];
 					$parent_uri_id = $item['parent-uri-id'];
@@ -213,9 +210,9 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		throw new HTTPException\NotFoundException(DI::l10n()->t('The requested item doesn\'t exist or has been deleted.'));
 	}
 
-	if (!DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
-		DI::notification()->setAllSeenForUser(local_user(), ['parent-uri-id' => $item['parent-uri-id']]);
-		DI::notify()->setAllSeenForUser(local_user(), ['parent-uri-id' => $item['parent-uri-id']]);
+	if (!DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'detailed_notif')) {
+		DI::notification()->setAllSeenForUser(DI::userSession()->getLocalUserId(), ['parent-uri-id' => $item['parent-uri-id']]);
+		DI::notify()->setAllSeenForUser(DI::userSession()->getLocalUserId(), ['parent-uri-id' => $item['parent-uri-id']]);
 	}
 
 	// We are displaying an "alternate" link if that post was public. See issue 2864
@@ -234,17 +231,17 @@ function display_content(App $a, $update = false, $update_uid = 0)
 					'$conversation' => $conversation]);
 
 	$is_remote_contact = false;
-	$item_uid = local_user();
+	$item_uid = DI::userSession()->getLocalUserId();
 	$page_uid = 0;
 
 	$parent = null;
-	if (!local_user() && !empty($parent_uri_id)) {
+	if (!DI::userSession()->getLocalUserId() && !empty($parent_uri_id)) {
 		$parent = Post::selectFirst(['uid'], ['uri-id' => $parent_uri_id, 'wall' => true]);
 	}
 
 	if (DBA::isResult($parent)) {
 		$page_uid = $page_uid ?? 0 ?: $parent['uid'];
-		$is_remote_contact = Session::getRemoteContactID($page_uid);
+		$is_remote_contact = DI::userSession()->getRemoteContactID($page_uid);
 		if ($is_remote_contact) {
 			$item_uid = $parent['uid'];
 		}
@@ -252,11 +249,11 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		$page_uid = $item['uid'];
 	}
 
-	if (!empty($page_uid) && ($page_uid != local_user())) {
+	if (!empty($page_uid) && ($page_uid != DI::userSession()->getLocalUserId())) {
 		$page_user = User::getById($page_uid);
 	}
 
-	$is_owner = local_user() && (in_array($page_uid, [local_user(), 0]));
+	$is_owner = DI::userSession()->getLocalUserId() && (in_array($page_uid, [DI::userSession()->getLocalUserId(), 0]));
 
 	if (!empty($page_user['hidewall']) && !$is_owner && !$is_remote_contact) {
 		throw new HTTPException\ForbiddenException(DI::l10n()->t('Access to this profile has been restricted.'));
@@ -268,8 +265,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	}
 	$sql_extra = Item::getPermissionsSQLByUserId($page_uid);
 
-	if (local_user() && (local_user() == $page_uid)) {
-		$condition = ['parent-uri-id' => $parent_uri_id, 'uid' => local_user(), 'unseen' => true];
+	if (DI::userSession()->getLocalUserId() && (DI::userSession()->getLocalUserId() == $page_uid)) {
+		$condition = ['parent-uri-id' => $parent_uri_id, 'uid' => DI::userSession()->getLocalUserId(), 'unseen' => true];
 		$unseen = Post::exists($condition);
 	} else {
 		$unseen = false;
@@ -290,11 +287,11 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$item['uri-id'] = $item['parent-uri-id'];
 
 	if ($unseen) {
-		$condition = ['parent-uri-id' => $parent_uri_id, 'uid' => local_user(), 'unseen' => true];
+		$condition = ['parent-uri-id' => $parent_uri_id, 'uid' => DI::userSession()->getLocalUserId(), 'unseen' => true];
 		Item::update(['unseen' => false], $condition);
 	}
 
-	if (!$update && local_user()) {
+	if (!$update && DI::userSession()->getLocalUserId()) {
 		$o .= "<script> var netargs = '?uri_id=" . $item['uri-id'] . "'; </script>";
 	}