X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact%2FHovercard.php;h=5c82fd2c4243217303853dcd2aafc867773ef224;hb=79235b6db1c9badd6c9602d54ad0d550e4bec2fd;hp=199c47ac6e1bc4b368852164abcb94d5de7717e7;hpb=04d620fc2f567d32b50f5d5b0974acafeb072177;p=friendica.git

diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index 199c47ac6e..5c82fd2c42 100644
--- a/src/Module/Contact/Hovercard.php
+++ b/src/Module/Contact/Hovercard.php
@@ -1,69 +1,68 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module\Contact;
 
 use Friendica\BaseModule;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\GContact;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Strings;
-use Friendica\Util\Proxy;
 
 /**
  * Asynchronous HTML fragment provider for frio contact hovercards
  */
 class Hovercard extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	protected function rawContent(array $request = [])
 	{
 		$contact_url = $_REQUEST['url'] ?? '';
 
 		// Get out if the system doesn't have public access allowed
-		if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
+		if (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) {
 			throw new HTTPException\ForbiddenException();
 		}
 
-		// If a contact is connected the url is internally changed to 'redir/CID'. We need the pure url to search for
-		// the contact. So we strip out the contact id from the internal url and look in the contact table for
-		// the real url (nurl)
-		if (strpos($contact_url, 'redir/') === 0) {
-			$cid = intval(substr($contact_url, 6));
-			$remote_contact = Contact::selectFirst(['nurl'], ['id' => $cid]);
+		/* Possible formats for relative URLs that need to be converted to the absolute contact URL:
+		 * - contact/redir/123456
+		 * - contact/123456/conversations
+		 */
+		if (strpos($contact_url, 'contact/') === 0 && preg_match('/(\d+)/', $contact_url, $matches)) {
+			$remote_contact = Contact::selectFirst(['nurl'], ['id' => $matches[1]]);
 			$contact_url = $remote_contact['nurl'] ?? '';
 		}
 
-		$contact = [];
-
-		// if it's the url containing https it should be converted to http
-		$contact_nurl = Strings::normaliseLink(GContact::cleanContactUrl($contact_url));
-		if (!$contact_nurl) {
+		if (!$contact_url) {
 			throw new HTTPException\BadRequestException();
 		}
 
 		// Search for contact data
 		// Look if the local user has got the contact
-		if (Session::isAuthenticated()) {
-			$contact = Contact::getDetailsByURL($contact_nurl, local_user());
-		}
-
-		// If not then check the global user
-		if (!count($contact)) {
-			$contact = Contact::getDetailsByURL($contact_nurl);
-		}
-
-		// Feeds url could have been destroyed through "cleanContactUrl", so we now use the original url
-		if (!count($contact) && Session::isAuthenticated()) {
-			$contact_nurl = Strings::normaliseLink($contact_url);
-			$contact = Contact::getDetailsByURL($contact_nurl, local_user());
-		}
-
-		if (!count($contact)) {
-			$contact_nurl = Strings::normaliseLink($contact_url);
-			$contact = Contact::getDetailsByURL($contact_nurl);
+		if (DI::userSession()->isAuthenticated()) {
+			$contact = Contact::getByURLForUser($contact_url, DI::userSession()->getLocalUserId());
+		} else {
+			$contact = Contact::getByURL($contact_url, false);
 		}
 
 		if (!count($contact)) {
@@ -71,7 +70,7 @@ class Hovercard extends BaseModule
 		}
 
 		// Get the photo_menu - the menu if possible contact actions
-		if (Session::isAuthenticated()) {
+		if (DI::userSession()->isAuthenticated()) {
 			$actions = Contact::photoMenu($contact);
 		} else {
 			$actions = [];
@@ -84,21 +83,20 @@ class Hovercard extends BaseModule
 				'name'         => $contact['name'],
 				'nick'         => $contact['nick'],
 				'addr'         => $contact['addr'] ?: $contact['url'],
-				'thumb'        => Proxy::proxifyUrl($contact['thumb'], false, Proxy::SIZE_THUMB),
-				'url'          => Contact::magicLink($contact['url']),
+				'thumb'        => Contact::getThumb($contact),
+				'url'          => Contact::magicLinkByContact($contact),
 				'nurl'         => $contact['nurl'],
 				'location'     => $contact['location'],
-				'gender'       => $contact['gender'],
 				'about'        => $contact['about'],
 				'network_link' => Strings::formatNetworkName($contact['network'], $contact['url']),
 				'tags'         => $contact['keywords'],
-				'bd'           => $contact['birthday'] <= DBA::NULL_DATE ? '' : $contact['birthday'],
-				'account_type' => Contact::getAccountType($contact),
+				'bd'           => $contact['bd'] <= DBA::NULL_DATE ? '' : $contact['bd'],
+				'account_type' => Contact::getAccountType($contact['contact-type']),
 				'actions'      => $actions,
 			],
 		]);
 
 		echo $o;
-		exit();
+		System::exit();
 	}
 }