X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact%2FHovercard.php;h=4d58d994c283a4a473afea3c3fe5f408e920c4d6;hb=c62762297cf2a06bad998a2b950b96102cb6e682;hp=199c47ac6e1bc4b368852164abcb94d5de7717e7;hpb=04d620fc2f567d32b50f5d5b0974acafeb072177;p=friendica.git diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php index 199c47ac6e..4d58d994c2 100644 --- a/src/Module/Contact/Hovercard.php +++ b/src/Module/Contact/Hovercard.php @@ -1,69 +1,87 @@ . + * + */ namespace Friendica\Module\Contact; +use Friendica\App; use Friendica\BaseModule; +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\Session; +use Friendica\Core\Session\Capability\IHandleUserSessions; +use Friendica\Core\System; use Friendica\Database\DBA; -use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\GContact; +use Friendica\Module\Response; use Friendica\Network\HTTPException; +use Friendica\Util\Profiler; use Friendica\Util\Strings; -use Friendica\Util\Proxy; +use Psr\Log\LoggerInterface; /** * Asynchronous HTML fragment provider for frio contact hovercards */ class Hovercard extends BaseModule { - public static function rawContent(array $parameters = []) + /** @var IManageConfigValues */ + private $config; + /** @var IHandleUserSessions */ + private $userSession; + + public function __construct(IHandleUserSessions $userSession, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { - $contact_url = $_REQUEST['url'] ?? ''; + parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); + + $this->config = $config; + $this->userSession = $userSession; + } + + 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 ($this->config->get('system', 'block_public') && !$this->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]); - $contact_url = $remote_contact['nurl'] ?? ''; + /* 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 ($this->userSession->isAuthenticated()) { + $contact = Contact::getByURLForUser($contact_url, $this->userSession->getLocalUserId()); + } else { + $contact = Contact::getByURL($contact_url, false); } if (!count($contact)) { @@ -71,34 +89,32 @@ class Hovercard extends BaseModule } // Get the photo_menu - the menu if possible contact actions - if (Session::isAuthenticated()) { - $actions = Contact::photoMenu($contact); + if ($this->userSession->isAuthenticated()) { + $actions = Contact::photoMenu($contact, $this->userSession->getLocalUserId()); } else { $actions = []; } // Move the contact data to the profile array so we can deliver it to $tpl = Renderer::getMarkupTemplate('hovercard.tpl'); - $o = Renderer::replaceMacros($tpl, [ + $o = Renderer::replaceMacros($tpl, [ '$profile' => [ '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::httpExit($o); } }