<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
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
// the real url (nurl)
if (strpos($contact_url, 'redir/') === 0) {
$cid = intval(substr($contact_url, 6));
+ }
+
+ if (strpos($contact_url, 'contact/') === 0) {
+ $cid = intval(substr($contact_url, 8));
+ }
+
+ if (!empty($cid)) {
$remote_contact = Contact::selectFirst(['nurl'], ['id' => $cid]);
$contact_url = $remote_contact['nurl'] ?? '';
}
// Search for contact data
// Look if the local user has got the contact
if (Session::isAuthenticated()) {
- $contact = Contact::getByURLForUser($contact_url, local_user(), [], false);
+ $contact = Contact::getByURLForUser($contact_url, local_user());
} else {
$contact = Contact::getByURL($contact_url, false);
}
'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'],
'about' => $contact['about'],