bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

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

Browse source 
use magic links for common/all friends and the directory
This commit is contained in:
Hypolite Petovan 2019-01-19 10:06:35 -05:00 committed by GitHub
parent 906f7b5698 7b78ba3929
commit 6aebece494
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/allfriends.php
View file

@ -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),

2
mod/common.php
View file

@ -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),

4
mod/directory.php
View file

@ -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'],

2
src/Content/Text/HTML.php
View file

@ -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

32
src/Content/Widget.php
View file

@ -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
]);
}
/**

2
src/Model/Contact.php
View file

@ -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;
}