From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 19 Dec 2022 04:52:33 +0000 (-0500)
Subject: Remove VCard for owner in Profile\Photos module
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5392bafbb483a20a4340bb48b4713a644b61b8dc;p=friendica.git

Remove VCard for owner in Profile\Photos module

- Remove unused remote contact retrieval
- Remove contact list from aside for non-owner visitors
---

diff --git a/src/Module/Profile/Photos.php b/src/Module/Profile/Photos.php
index caf0d16011..7765474403 100644
--- a/src/Module/Profile/Photos.php
+++ b/src/Module/Profile/Photos.php
@@ -78,7 +78,7 @@ class Photos extends \Friendica\Module\BaseProfile
 		$this->systemMessages = $systemMessages;
 		$this->aclFormatter   = $aclFormatter;
 
-		$owner = Profile::load($this->app, $this->parameters['nickname'] ?? '');
+		$owner = Profile::load($this->app, $this->parameters['nickname'] ?? '', false);
 		if (!$owner || $owner['account_removed'] || $owner['account_expired']) {
 			throw new HTTPException\NotFoundException($this->t('User not found.'));
 		}
@@ -318,16 +318,8 @@ class Photos extends \Friendica\Module\BaseProfile
 		$owner_uid = $this->owner['uid'];
 		$is_owner  = $this->session->getLocalUserId() == $owner_uid;
 
-		$remote_contact = false;
-		if ($this->session->getRemoteContactID($owner_uid)) {
-			$contact_id = $this->session->getRemoteContactID($owner_uid);
-
-			$contact        = Contact::getContactForUser($contact_id, $owner_uid, ['blocked', 'pending']);
-			$remote_contact = $contact && !$contact['blocked'] && !$contact['pending'];
-		}
-
 		if ($this->owner['hidewall'] && !$this->session->isAuthenticated()) {
-			$this->baseUrl->redirect('profile/' . $owner['nickname'] . '/restricted');
+			$this->baseUrl->redirect('profile/' . $this->owner['nickname'] . '/restricted');
 		}
 
 		$this->session->set('photo_return', $this->args->getCommand());
@@ -412,6 +404,11 @@ class Photos extends \Friendica\Module\BaseProfile
 			]);
 		}
 
+		// Removing vCard for owner
+		if ($is_owner) {
+			$this->page['aside'] = '';
+		}
+
 		if (!empty($photo_albums_widget)) {
 			$this->page['aside'] .= $photo_albums_widget;
 		}