X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=bb69a611cb1029e672f7e8e399a50f15214a49c0;hb=b521e45903544f15443d9f77bfe684c67d139873;hp=b51768e8004099dab64b74fa2e76ab2f23b53b12;hpb=e05c1821c297d6051c893cec33008b98741e7e89;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index b51768e800..bb69a611cb 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -22,7 +22,6 @@
 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;
@@ -32,44 +31,44 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
+use Friendica\Model\User;
 use Friendica\Module\ActivityPub\Objects;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
-use Friendica\Util\Strings;
 
 function display_init(App $a)
 {
 	if (ActivityPub::isRequest()) {
-		Objects::rawContent(['guid' => $a->argv[1] ?? null]);
+		Objects::rawContent(['guid' => DI::args()->getArgv()[1] ?? null]);
 	}
 
 	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();
 
-	$fields = ['uri-id', 'parent-uri-id', 'author-id', 'body', 'uid', 'guid', 'gravity'];
+	$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) {
-		$nick = "";
+	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;
@@ -81,10 +80,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);
 		}
@@ -95,8 +94,8 @@ 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')) {
@@ -109,41 +108,29 @@ function display_init(App $a)
 		$item = $parent ?: $item;
 	}
 
-	$profiledata = display_fetchauthor($a, $item);
-
-	if (strstr(Strings::normaliseLink($profiledata['url']), Strings::normaliseLink(DI::baseUrl()))) {
-		$nickname = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/profile/', '', Strings::normaliseLink($profiledata['url']));
-
-		if (!empty($a->user['nickname']) && $nickname != $a->user['nickname']) {
-			$profile = DBA::selectFirst('owner-view', [], ['nickname' => $nickname]);
-			if (DBA::isResult($profile)) {
-				$profiledata = $profile;
-			}
-			$profiledata["network"] = Protocol::DFRN;
-		} else {
-			$profiledata = [];
-		}
-	}
+	$profiledata = display_fetchauthor($item);
 
 	DI::page()['aside'] = Widget\VCard::getHTML($profiledata);
 }
 
-function display_fetchauthor($a, $item)
+function display_fetchauthor($item)
 {
-	$author = DBA::selectFirst('contact', ['name', 'nick', 'photo', 'network', 'url'], ['id' => $item['author-id']]);
-
-	$profiledata = [];
-	$profiledata['uid'] = -1;
-	$profiledata['nickname'] = $author['nick'];
-	$profiledata['name'] = $author['name'];
-	$profiledata['picdate'] = '';
-	$profiledata['photo'] = $author['photo'];
-	$profiledata['url'] = $author['url'];
-	$profiledata['network'] = $author['network'];
+	$profiledata = Contact::getByURLForUser($item['author-link'], local_user());
 
 	// Check for a repeated message
 	$shared = Item::getShareArray($item);
 	if (!empty($shared) && empty($shared['comment'])) {
+		$profiledata = [
+			'uid' => -1,
+			'id' => -1,
+			'nickname' => '',
+			'name' => '',
+			'picdate' => '',
+			'photo' => '',
+			'url' => '',
+			'network' => '',
+		];
+
 		if (!empty($shared['author'])) {
 			$profiledata['name'] = $shared['author'];
 		}
@@ -156,17 +143,17 @@ function display_fetchauthor($a, $item)
 			$profiledata['photo'] = $shared['avatar'];
 		}
 
-		$profiledata["nickname"] = $profiledata["name"];
-		$profiledata["network"] = Protocol::matchByProfileUrl($profiledata["url"]);
+		$profiledata['nickname'] = $profiledata['name'];
+		$profiledata['network'] = Protocol::matchByProfileUrl($profiledata['url']);
 
-		$profiledata["address"] = "";
-		$profiledata["about"] = "";
-	}
+		$profiledata['address'] = '';
+		$profiledata['about'] = '';
 
-	$profiledata = Contact::getByURLForUser($profiledata["url"], local_user()) ?: $profiledata;
+		$profiledata = Contact::getByURLForUser($profiledata['url'], local_user()) ?: $profiledata;
+	}
 
-	if (!empty($profiledata["photo"])) {
-		$profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]);
+	if (!empty($profiledata['photo'])) {
+		$profiledata['photo'] = DI::baseUrl()->remove($profiledata['photo']);
 	}
 
 	return $profiledata;
@@ -186,24 +173,24 @@ 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]]);
 		if (!empty($item)) {
 			if ($item['uid'] != 0) {
-				$a->profile = ['uid' => intval($item['uid'])];
+				$a->setProfileOwner($item['uid']);
 			} else {
-				$a->profile = ['uid' => 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()];
+				$condition = ['guid' => DI::args()->getArgv()[1], 'uid' => local_user()];
 				$item = Post::selectFirstForUser(local_user(), $fields, $condition);
 				if (DBA::isResult($item)) {
 					$uri_id = $item['uri-id'];
@@ -212,7 +199,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'];
@@ -220,7 +207,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'];
@@ -273,31 +260,19 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		$page_uid = $item['uid'];
 	}
 
-	$page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $page_uid]);
-	if (DBA::isResult($page_contact)) {
-		$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($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) {
+	if (!empty($page_user['hidewall']) && !$is_owner && !$is_remote_contact) {
 		throw new HTTPException\ForbiddenException(DI::l10n()->t('Access to this profile has been restricted.'));
 	}
 
 	// 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 .= status_editor($a, [], 0, true);
 	}
 	$sql_extra = Item::getPermissionsSQLByUserId($page_uid);
 
@@ -334,13 +309,13 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', $item_uid);
 
 	// Preparing the meta header
-	$description = trim(BBCode::toPlaintext($item["body"]));
-	$title = trim(BBCode::toPlaintext($item["title"]));
-	$author_name = $item["author-name"];
+	$description = trim(BBCode::toPlaintext($item['body']));
+	$title = trim(BBCode::toPlaintext($item['title']));
+	$author_name = $item['author-name'];
 
-	$image = DI::baseUrl()->remove($item["author-avatar"]);
+	$image = DI::baseUrl()->remove($item['author-avatar']);
 
-	if ($title == "") {
+	if ($title == '') {
 		$title = $author_name;
 	}