X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=880cfd44b86eb6af3280594f717b4ce74ebb4199;hb=e555ea6aadaaaa178f108b313b728a7b6144b42f;hp=3a93e504aed36d20d30179b0dc2855922b7c5e12;hpb=f60d60e99704430c8a25a1d09fff6cf2ee2ee887;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index 3a93e504ae..880cfd44b8 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,11 +22,10 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
-use Friendica\Core\ACL;
 use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -34,22 +33,23 @@ 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\Util\Strings;
+use Friendica\Protocol\Diaspora;
 
 function display_init(App $a)
 {
 	if (ActivityPub::isRequest()) {
-		Objects::rawContent(['guid' => $a->argv[1] ?? null]);
+		(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()) {
 		return;
 	}
 
-	$nick = (($a->argc > 1) ? $a->argv[1] : '');
+	$nick = ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : '');
 
 	$item = null;
 	$item_user = local_user();
@@ -57,20 +57,20 @@ function display_init(App $a)
 	$fields = ['uri-id', 'parent-uri-id', 'author-id', 'author-link', 'body', 'uid', 'guid', 'gravity'];
 
 	// If there is only one parameter, then check if this parameter could be a guid
-	if ($a->argc == 2) {
+	if (DI::args()->getArgc() == 2) {
 		$nick = '';
 
 		// Does the local user have this item?
 		if (local_user()) {
-			$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]);
+			$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => DI::args()->getArgv()[1], 'uid' => local_user()]);
 			if (DBA::isResult($item)) {
-				$nick = $a->user['nickname'];
+				$nick = $a->getLoggedInUserNickname();
 			}
 		}
 
 		// Is this item private but could be visible to the remove visitor?
 		if (!DBA::isResult($item) && remote_user()) {
-			$item = Post::selectFirst($fields, ['guid' => $a->argv[1], 'private' => Item::PRIVATE, 'origin' => true]);
+			$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'])) {
 					$item = null;
@@ -82,10 +82,10 @@ function display_init(App $a)
 
 		// Is it an item with uid=0?
 		if (!DBA::isResult($item)) {
-			$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
+			$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => DI::args()->getArgv()[1], 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
 		}
-	} elseif ($a->argc >= 3 && $nick == 'feed-item') {
-		$uri_id = $a->argv[2];
+	} 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);
 		}
@@ -96,12 +96,12 @@ function display_init(App $a)
 		return;
 	}
 
-	if ($a->argc >= 3 && $nick == 'feed-item') {
-		displayShowFeed($item['uri-id'], $item['uid'], $a->argc > 3 && $a->argv[3] == 'conversation.atom');
+	if (DI::args()->getArgc() >= 3 && $nick == 'feed-item') {
+		displayShowFeed($item['uri-id'], $item['uid'], DI::args()->getArgc() > 3 && DI::args()->getArgv()[3] == 'conversation.atom');
 	}
 
 	if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
-		Logger::log('Directly serving XML for uri-id '.$item['uri-id'], Logger::DEBUG);
+		Logger::info('Directly serving XML for uri-id '.$item['uri-id']);
 		displayShowFeed($item['uri-id'], $item['uid'], false);
 	}
 
@@ -110,54 +110,23 @@ function display_init(App $a)
 		$item = $parent ?: $item;
 	}
 
-	$profiledata = display_fetchauthor($item);
-
-	DI::page()['aside'] = Widget\VCard::getHTML($profiledata);
+	DI::page()['aside'] = Widget\VCard::getHTML(display_fetchauthor($item));
 }
 
 function display_fetchauthor($item)
 {
-	$profiledata = Contact::getByURLForUser($item['author-link'], local_user());
-
-	// Check for a repeated message
-	$shared = Item::getShareArray($item);
-	if (!empty($shared) && empty($shared['comment'])) {
-		$profiledata = [];
-		$profiledata['uid'] = -1;
-		$profiledata['id'] = -1;
-		$profiledata['nickname'] = '';
-		$profiledata['name'] = '';
-		$profiledata['picdate'] = '';
-		$profiledata['photo'] = '';
-		$profiledata['url'] = '';
-		$profiledata['network'] = '';
-
-		if (!empty($shared['author'])) {
-			$profiledata['name'] = $shared['author'];
-		}
-
+	if (Diaspora::isReshare($item['body'], true)) {
+		$shared = Item::getShareArray($item);
 		if (!empty($shared['profile'])) {
-			$profiledata['url'] = $shared['profile'];
-		}
-
-		if (!empty($shared['avatar'])) {
-			$profiledata['photo'] = $shared['avatar'];
+			$contact = Contact::getByURLForUser($shared['profile'], local_user());
 		}
-
-		$profiledata['nickname'] = $profiledata['name'];
-		$profiledata['network'] = Protocol::matchByProfileUrl($profiledata['url']);
-
-		$profiledata['address'] = '';
-		$profiledata['about'] = '';
-
-		$profiledata = Contact::getByURLForUser($profiledata['url'], local_user()) ?: $profiledata;
 	}
 
-	if (!empty($profiledata['photo'])) {
-		$profiledata['photo'] = DI::baseUrl()->remove($profiledata['photo']);
+	if (empty($contact)) {
+		$contact = Contact::getById($item['author-id']);
 	}
 
-	return $profiledata;
+	return $contact;
 }
 
 function display_content(App $a, $update = false, $update_uid = 0)
@@ -174,25 +143,25 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
 	if ($update) {
 		$uri_id = $_REQUEST['uri_id'];
-		$item = Post::selectFirst(['uid', 'parent-uri-id'], ['uri-id' => $uri_id, 'uid' => $update_uid]);
+		$item = Post::selectFirst(['uid', 'parent-uri-id'], ['uri-id' => $uri_id, 'uid' => [0, $update_uid]], ['order' => ['uid' => true]]);
 		if (!empty($item)) {
 			if ($item['uid'] != 0) {
-				$a->profile_owner = intval($item['uid']);
+				$a->setProfileOwner($item['uid']);
 			} else {
-				$a->profile_owner = intval($update_uid);
+				$a->setProfileOwner($update_uid);
 			}
 			$parent_uri_id = $item['parent-uri-id'];
 		}
 	} else {
-		$uri_id = (($a->argc > 2) ? $a->argv[2] : 0);
+		$uri_id = ((DI::args()->getArgc() > 2) ? DI::args()->getArgv()[2] : 0);
 		$parent_uri_id = $uri_id;
 
-		if ($a->argc == 2) {
+		if (DI::args()->getArgc() == 2) {
 			$fields = ['uri-id', 'parent-uri-id', 'uid'];
 
 			if (local_user()) {
-				$condition = ['guid' => $a->argv[1], 'uid' => local_user()];
-				$item = Post::selectFirstForUser(local_user(), $fields, $condition);
+				$condition = ['guid' => DI::args()->getArgv()[1], 'uid' => [0, local_user()]];
+				$item = Post::selectFirstForUser(local_user(), $fields, $condition, ['order' => ['uid' => true]]);
 				if (DBA::isResult($item)) {
 					$uri_id = $item['uri-id'];
 					$parent_uri_id = $item['parent-uri-id'];
@@ -200,7 +169,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 			}
 
 			if (($parent_uri_id == 0) && remote_user()) {
-				$item = Post::selectFirst($fields, ['guid' => $a->argv[1], 'private' => Item::PRIVATE, 'origin' => true]);
+				$item = Post::selectFirst($fields, ['guid' => DI::args()->getArgv()[1], 'private' => Item::PRIVATE, 'origin' => true]);
 				if (DBA::isResult($item) && Contact::isFollower(remote_user(), $item['uid'])) {
 					$uri_id = $item['uri-id'];
 					$parent_uri_id = $item['parent-uri-id'];
@@ -208,7 +177,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 			}
 
 			if ($parent_uri_id == 0) {
-				$condition = ['private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $a->argv[1], 'uid' => 0];
+				$condition = ['private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => DI::args()->getArgv()[1], 'uid' => 0];
 				$item = Post::selectFirstForUser(local_user(), $fields, $condition);
 				if (DBA::isResult($item)) {
 					$uri_id = $item['uri-id'];
@@ -223,8 +192,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	}
 
 	if (!DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
-		DBA::update('notification', ['seen' => true], ['parent-uri-id' => $item['parent-uri-id'], 'uid' => local_user()]);
-		DBA::update('notify', ['seen' => true], ['parent-uri-id' => $item['parent-uri-id'], 'uid' => local_user()]);
+		DI::notification()->setAllSeenForUser(local_user(), ['parent-uri-id' => $item['parent-uri-id']]);
+		DI::notify()->setAllSeenForUser(local_user(), ['parent-uri-id' => $item['parent-uri-id']]);
 	}
 
 	// We are displaying an "alternate" link if that post was public. See issue 2864
@@ -247,7 +216,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$page_uid = 0;
 
 	$parent = null;
-	if (!empty($parent_uri_id)) {
+	if (!local_user() && !empty($parent_uri_id)) {
 		$parent = Post::selectFirst(['uid'], ['uri-id' => $parent_uri_id, 'wall' => true]);
 	}
 
@@ -261,16 +230,11 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		$page_uid = $item['uid'];
 	}
 
-	$page_contact = DBA::selectFirst('contact', ['id', 'url', 'network', 'name'], ['self' => true, 'uid' => $page_uid]);
-	if (DBA::isResult($page_contact)) {
-		// "$a->page_contact" is only used in "checkWallToWall" in Post.php.
-		// It is used for the wall post feature that has its issues.
-		// It can't work with AP or Diaspora since the creator can't sign the post with their private key.
-		$a->page_contact = $page_contact;
+	if (!empty($page_uid) && ($page_uid != local_user())) {
 		$page_user = User::getById($page_uid);
 	}
 
-	$is_owner = (local_user() && (in_array($page_uid, [local_user(), 0])) ? true : false);
+	$is_owner = local_user() && (in_array($page_uid, [local_user(), 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.'));
@@ -278,18 +242,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
 	// We need the editor here to be able to reshare an item.
 	if ($is_owner && !$update) {
-		$x = [
-			'is_owner' => true,
-			'allow_location' => $a->user['allow_location'],
-			'default_location' => $a->user['default-location'],
-			'nickname' => $a->user['nickname'],
-			'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
-			'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true),
-			'bang' => '',
-			'visitor' => 'block',
-			'profile_uid' => local_user(),
-		];
-		$o .= status_editor($a, $x, 0, true);
+		$o .= DI::conversation()->statusEditor([], 0, true);
 	}
 	$sql_extra = Item::getPermissionsSQLByUserId($page_uid);
 
@@ -323,7 +276,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		$o .= "<script> var netargs = '?uri_id=" . $item['uri-id'] . "'; </script>";
 	}
 
-	$o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', $item_uid);
+	$o .= DI::conversation()->create([$item], 'display', $update_uid, false, 'commented', $item_uid);
 
 	// Preparing the meta header
 	$description = trim(BBCode::toPlaintext($item['body']));
@@ -391,7 +344,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);
 }