X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=d04b878c4b578863b701e462cab401ce9e5c66e1;hb=f609386ca11d805838f5526261068a69b489eab0;hp=da41c8656e9499d28fd26e8685b00dbfddac6379;hpb=4e45987f74ccbe61a53c711317c2e45894435ece;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index da41c8656e..d04b878c4b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -24,7 +24,7 @@ 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;
 use Friendica\Model\Contact;
@@ -32,10 +32,12 @@ use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Module\ActivityPub\Objects;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
+use Friendica\Util\DateTimeFormat;
 
 function display_init(App $a)
 {
@@ -43,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'];
 
@@ -59,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'];
@@ -80,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)) {
@@ -99,16 +101,23 @@ function display_init(App $a)
 	}
 
 	if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
-		Logger::info('Directly serving XML for uri-id '.$item['uri-id']);
+		Logger::debug('Directly serving XML', ['uri-id' => $item['uri-id']]);
 		displayShowFeed($item['uri-id'], $item['uid'], false);
 	}
 
-	if ($item['gravity'] != GRAVITY_PARENT) {
-		$parent = Post::selectFirstForUser($item_user, $fields, ['uid' => $item['uid'], 'uri-id' => $item['parent-uri-id']]);
+	if ($item['gravity'] != Item::GRAVITY_PARENT) {
+		$parent = Post::selectFirstForUser($item_user, $fields, ['uid' => [0, $item_user], 'uri-id' => $item['parent-uri-id']], ['order' => ['uid' => true]]);
 		$item = $parent ?: $item;
 	}
 
-	DI::page()['aside'] = Widget\VCard::getHTML(display_fetchauthor($item));
+	$author = display_fetchauthor($item);
+
+	if (\Friendica\Util\Network::isLocalLink($author['url'])) {
+		\Friendica\Model\Profile::load(DI::app(), $author['nick'], false);
+	} else {
+		DI::page()['aside'] = Widget\VCard::getHTML($author);
+	}
+	$a->setProfileOwner($item['uid']);
 }
 
 function display_fetchauthor($item)
@@ -116,7 +125,7 @@ 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());
+			$contact = Contact::getByURLForUser($shared['profile'], DI::userSession()->getLocalUserId());
 		}
 	}
 
@@ -129,7 +138,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.'));
 	}
 
@@ -150,6 +159,20 @@ function display_content(App $a, $update = false, $update_uid = 0)
 			}
 			$parent_uri_id = $item['parent-uri-id'];
 		}
+		if (empty($_REQUEST['force'])) {
+			$browser_update = intval(DI::pConfig()->get($update_uid, 'system', 'update_interval'));
+			if (!empty($browser_update)) {
+				$update_date = date(DateTimeFormat::MYSQL, time() - ($browser_update / 500));
+				if (!Post::exists(["`parent-uri-id` = ? AND `uid` IN (?, ?) AND `received` > ?", $parent_uri_id, 0, $update_uid, $update_date])) {
+					Logger::debug('No updated content', ['uri-id' => $uri_id, 'uid' => $update_uid, 'updated' => $update_date]);
+					return '';
+				} else {
+					Logger::debug('Updated content found', ['uri-id' => $uri_id, 'uid' => $update_uid, 'updated' => $update_date]);
+				}
+			}	
+		} else {
+			Logger::debug('Forced content update', ['uri-id' => $uri_id, 'uid' => $update_uid]);
+		}
 	} else {
 		$uri_id = ((DI::args()->getArgc() > 2) ? DI::args()->getArgv()[2] : 0);
 		$parent_uri_id = $uri_id;
@@ -157,18 +180,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'];
 				}
@@ -176,7 +199,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'];
@@ -189,9 +212,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
@@ -210,17 +233,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'];
 		}
@@ -228,11 +251,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.'));
@@ -244,8 +267,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;
@@ -266,11 +289,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>";
 	}
 
@@ -278,7 +301,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
 	// Preparing the meta header
 	$description = trim(BBCode::toPlaintext($item['body']));
-	$title = trim(BBCode::toPlaintext($item['title']));
+	$title = trim(BBCode::toPlaintext($item['title'] ?? ''));
 	$author_name = $item['author-name'];
 
 	$image = DI::baseUrl()->remove($item['author-avatar']);
@@ -342,7 +365,6 @@ function displayShowFeed(int $uri_id, int $uid, bool $conversation)
 	if ($xml == '') {
 		throw new HTTPException\InternalServerErrorException(DI::l10n()->t('The feed for this item is unavailable.'));
 	}
-	header("Content-type: application/atom+xml");
-	echo $xml;
-	exit();
+
+	System::httpExit($xml, Response::TYPE_ATOM);
 }