friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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

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 = [ $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'],

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 * @param array $contact Array with contacts which contains an array with
* int 'id' => The ID of the contact * 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\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
); ]);
} }
/** /**

2
src/Model/Contact.php
View File

@ -2089,7 +2089,7 @@ class Contact extends BaseObject
*/ */
public static function magicLink($contact_url, $url = '') 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; return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
} }