Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 06:22:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix - use magicLinks also for common/all friends and the directory

Browse source
This commit is contained in:
rabuzarus 2019-01-19 15:12:46 +01:00
parent 528d175baa
commit 7b78ba3929
4 changed files with 28 additions and 12 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 = [ $entry = [
'url' => $rr['url'], 'url' => Model\Contact::magicLink($rr['url']),
'itemurl' => defaults($contact_details, 'addr', $rr['url']), 'itemurl' => defaults($contact_details, 'addr', $rr['url']),
'name' => $contact_details['name'], 'name' => $contact_details['name'],
'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB), '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); $photo_menu = Model\Contact::photoMenu($common_friend);
$entry = [ $entry = [
'url' => $common_friend['url'], 'url' => Model\Contact::magicLink($common_friend['url']),
'itemurl' => defaults($contact_details, 'addr', $common_friend['url']), 'itemurl' => defaults($contact_details, 'addr', $common_friend['url']),
'name' => $contact_details['name'], 'name' => $contact_details['name'],
'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB), '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']); $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 />' : ''); $pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
@ -169,7 +169,7 @@ function directory_content(App $a)
$entry = [ $entry = [
'id' => $rr['id'], 'id' => $rr['id'],
'url' => $profile_link, 'url' => Contact::magicLInk($profile_link),
'itemurl' => $itemurl, 'itemurl' => $itemurl,
'thumb' => ProxyUtils::proxifyUrl($rr[$photo], false, ProxyUtils::SIZE_THUMB), 'thumb' => ProxyUtils::proxifyUrl($rr[$photo], false, ProxyUtils::SIZE_THUMB),
'img_hover' => $rr['name'], 'img_hover' => $rr['name'],

32
src/Content/Widget.php
View file

@ -18,6 +18,7 @@ use Friendica\Model\Contact;
use Friendica\Model\FileTag; use Friendica\Model\FileTag;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
@ -296,15 +297,30 @@ class Widget
$r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true); $r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true);
} }
return Renderer::replaceMacros(Renderer::getMarkupTemplate('remote_friends_common.tpl'), array( if (!DBA::isResult($r)) {
'$desc' => L10n::tt("%d contact in common", "%d contacts in common", $t), return;
'$base' => System::baseUrl(), }
'$uid' => $profile_uid,
'$cid' => (($cid) ? $cid : '0'), $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' : ''), '$linkmore' => (($t > 5) ? 'true' : ''),
'$more' => L10n::t('show more'), '$more' => L10n::t('show more'),
'$items' => $r) '$items' => $entries
); ]);
} }
/** /**