Merge pull request #6470 from rabuzarus/20190118_-_some_more_magic_links

use magic links for common/all friends and the directory

diff --git a/mod/allfriends.php b/mod/allfriends.php
index ceb32e6c1898dcefe2b2cc768c15ff609f5a9ef4..5234ee8c697abe5db8a3456e25eec1349ed83559 100644 (file)
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -77,7 +77,7 @@ function allfriends_content(App $a)
                }
 
                $entry = [
-                       'url'          => $rr['url'],
+                       'url'          => Model\Contact::magicLink($rr['url']),
                        'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
                        'name'         => $contact_details['name'],
                        'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),

diff --git a/mod/common.php b/mod/common.php
index 1c4032f11f411e49fbe0d6e81a8598cad21b827d..6b6090e19beedef238ac97652a75a628e5ef4019 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -117,7 +117,7 @@ function common_content(App $a)
                $photo_menu = Model\Contact::photoMenu($common_friend);
 
                $entry = [
-                       'url'          => $common_friend['url'],
+                       'url'          => Model\Contact::magicLink($common_friend['url']),
                        'itemurl'      => defaults($contact_details, 'addr', $common_friend['url']),
                        'name'         => $contact_details['name'],
                        'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),

diff --git a/mod/directory.php b/mod/directory.php
index 3fd0aa848bec837401e1132f14e41f1d567572d6..fa5ce73d4ca1d14ab2c87f62487a14aa3ccbd9b7 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -116,7 +116,7 @@ function directory_content(App $a)
 
                        $itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
 
-                       $profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+                       $profile_link = $rr['profile_url'];
 
                        $pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
 
@@ -169,7 +169,7 @@ function directory_content(App $a)
 
                        $entry = [
                                'id'           => $rr['id'],
-                               'url'          => $profile_link,
+                               'url'          => Contact::magicLInk($profile_link),
                                'itemurl'      => $itemurl,
                                'thumb'        => ProxyUtils::proxifyUrl($rr[$photo], false, ProxyUtils::SIZE_THUMB),
                                'img_hover'    => $rr['name'],

diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index f7ac040eec38a9fcaf947268c54f92267c195bef..a3ef8d81fc1167168d978fbf813b6a2f16330b27 100644 (file)
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -889,7 +889,7 @@ class HTML
        }
 
        /**
-        * @brief Format contacts as picture links or as texxt links
+        * @brief Format contacts as picture links or as text links
         *
         * @param array $contact Array with contacts which contains an array with
         *      int 'id' => The ID of the contact

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 35e8913e0869866dcf9c33778b46c5d2d6d8cb8b..adf6545b43c4a83ad8d2f7e09dc7eb466adcfcf3 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -18,6 +18,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
@@ -296,15 +297,30 @@ class Widget
                        $r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true);
                }
 
-               return Renderer::replaceMacros(Renderer::getMarkupTemplate('remote_friends_common.tpl'), array(
-                       '$desc' => L10n::tt("%d contact in common", "%d contacts in common", $t),
-                       '$base' => System::baseUrl(),
-                       '$uid' => $profile_uid,
-                       '$cid' => (($cid) ? $cid : '0'),
+               if (!DBA::isResult($r)) {
+                       return;
+               }
+
+               $entries = [];
+               foreach ($r as $rr) {
+                       $entry = [
+                               'url'   => Contact::magicLink($rr['url']),
+                               'name'  => $rr['name'],
+                               'photo' => ProxyUtils::proxifyUrl($rr['photo'], false, ProxyUtils::SIZE_THUMB),
+                       ];
+                       $entries[] = $entry;
+               }
+
+               $tpl = Renderer::getMarkupTemplate('remote_friends_common.tpl');
+               return Renderer::replaceMacros($tpl, [
+                       '$desc'     => L10n::tt("%d contact in common", "%d contacts in common", $t),
+                       '$base'     => System::baseUrl(),
+                       '$uid'      => $profile_uid,
+                       '$cid'      => (($cid) ? $cid : '0'),
                        '$linkmore' => (($t > 5) ? 'true' : ''),
-                       '$more' => L10n::t('show more'),
-                       '$items' => $r)
-               );
+                       '$more'     => L10n::t('show more'),
+                       '$items'    => $entries
+               ]);
        }
 
        /**

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 408a1ade4b0f2ff5a7815f26e76e215687b708f8..52bcc3b54b909d9c90bd5f52058f13b2f84c9c9b 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2089,7 +2089,7 @@ class Contact extends BaseObject
         */
        public static function magicLink($contact_url, $url = '')
        {
-               if (!local_user() && remote_user()) {
+               if (!local_user() && !remote_user()) {
                        return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
                }