Fix various spelling mistakes

[friendica.git] / mod / hovercard.php

diff --git a/mod/hovercard.php b/mod/hovercard.php
index 40d32be7ad6895462ec49cec4aba05e58db98c11..8b51eb00ae6b14881dde6128b32603b10e2228ea 100644 (file)
--- a/mod/hovercard.php
+++ b/mod/hovercard.php
@@ -14,6 +14,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
+use Friendica\Util\Proxy as ProxyUtils;
 
 function hovercard_init(App $a)
 {
@@ -54,10 +55,32 @@ function hovercard_content()
        $contact = [];
        // if it's the url containing https it should be converted to http
        $nurl = normalise_link(GContact::cleanContactUrl($profileurl));
-       if ($nurl) {
-               // Search for contact data
+       if (!$nurl) {
+               return;
+       }
+
+       // Search for contact data
+       // Look if the local user has got the contact
+       if (local_user()) {
+               $contact = Contact::getDetailsByURL($nurl, local_user());
+       }
+
+       // If not then check the global user
+       if (!count($contact)) {
                $contact = Contact::getDetailsByURL($nurl);
        }
+
+       // Feeds url could have been destroyed through "cleanContactUrl", so we now use the original url
+       if (!count($contact) && local_user()) {
+               $nurl = normalise_link($profileurl);
+               $contact = Contact::getDetailsByURL($nurl, local_user());
+       }
+
+       if (!count($contact)) {
+               $nurl = normalise_link($profileurl);
+               $contact = Contact::getDetailsByURL($nurl);
+       }
+
        if (!count($contact)) {
                return;
        }
@@ -74,7 +97,7 @@ function hovercard_content()
                'name'     => $contact['name'],
                'nick'     => $contact['nick'],
                'addr'     => defaults($contact, 'addr', $contact['url']),
-               'thumb'    => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB),
+               'thumb'    => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
                'url'      => Contact::magicLink($contact['url']),
                'nurl'     => $contact['nurl'], // We additionally store the nurl as identifier
                'location' => $contact['location'],