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

Replace q() calls in mod/viewcontacts

Browse source
This commit is contained in:
Hypolite Petovan 2018-12-25 11:36:41 -05:00
parent 00f90571ad
commit 4cd2c83d5c
1 changed files with 41 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
mod/viewcontacts.php
View file

@ -29,18 +29,13 @@ function viewcontacts_init(App $a)
Nav::setSelected('home'); Nav::setSelected('home');
$nick = $a->argv[1]; $user = DBA::selectFirst('user', [], ['nickname' => $a->argv[1], 'blocked' => false]);
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", if (!DBA::isResult($user)) {
DBA::escape($nick)
);
if (!DBA::isResult($r)) {
System::httpExit(404, ["title" => L10n::t('Page not found.')]); System::httpExit(404, ["title" => L10n::t('Page not found.')]);
} }
$a->data['user'] = $r[0]; $a->data['user'] = $user;
$a->profile_uid = $r[0]['uid']; $a->profile_uid = $user['uid'];
$is_owner = (local_user() && (local_user() == $a->profile_uid));
Profile::load($a, $a->argv[1]); Profile::load($a, $a->argv[1]);
} }
@ -54,82 +49,69 @@ function viewcontacts_content(App $a)
$is_owner = $a->profile['profile_uid'] == local_user(); $is_owner = $a->profile['profile_uid'] == local_user();
$o = "";
// tabs // tabs
$o .= Profile::getTabs($a, $is_owner, $a->data['user']['nickname']); $o = Profile::getTabs($a, $is_owner, $a->data['user']['nickname']);
if (!count($a->profile) || $a->profile['hide-friends']) { if (!count($a->profile) || $a->profile['hide-friends']) {
notice(L10n::t('Permission denied.') . EOL); notice(L10n::t('Permission denied.') . EOL);
return $o; return $o;
} }
$total = 0; $condition = [
$r = q("SELECT COUNT(*) AS `total` FROM `contact` 'uid' => $a->profile['uid'],
WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` 'blocked' => false,
AND NOT `hidden` AND NOT `archive` 'pending' => false,
AND `network` IN ('%s', '%s', '%s', '%s')", 'hidden' => false,
intval($a->profile['uid']), 'archive' => false,
DBA::escape(Protocol::ACTIVITYPUB), 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]
DBA::escape(Protocol::DFRN), ];
DBA::escape(Protocol::DIASPORA),
DBA::escape(Protocol::OSTATUS) $total = DBA::count('count', $condition);
);
if (DBA::isResult($r)) {
$total = $r[0]['total'];
}
$pager = new Pager($a->query_string); $pager = new Pager($a->query_string);
$r = q("SELECT * FROM `contact` $params = ['order' => ['name' => false], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
AND NOT `hidden` AND NOT `archive` $contacts_stmt = DBA::select('contact', [], $condition, $params);
AND `network` IN ('%s', '%s', '%s', '%s')
ORDER BY `name` ASC LIMIT %d, %d", if (!DBA::isResult($contacts_stmt)) {
intval($a->profile['uid']), info(L10n::t('No contacts.') . EOL);
DBA::escape(Protocol::ACTIVITYPUB),
DBA::escape(Protocol::DFRN),
DBA::escape(Protocol::DIASPORA),
DBA::escape(Protocol::OSTATUS),
$pager->getStart(),
$pager->getItemsPerPage()
);
if (!DBA::isResult($r)) {
info(L10n::t('No contacts.').EOL);
return $o; return $o;
} }
$contacts = []; $contacts = [];
foreach ($r as $rr) { while ($contact = DBA::fetch($contacts_stmt)) {
/// @TODO This triggers an E_NOTICE if 'self' is not there /// @TODO This triggers an E_NOTICE if 'self' is not there
if ($rr['self']) { if ($contact['self']) {
continue; continue;
} }
$contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr); $contact_details = Contact::getDetailsByURL($contact['url'], $a->profile['uid'], $contact);
$contacts[] = [ $contacts[] = [
'id' => $rr['id'], 'id' => $contact['id'],
'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $rr['url']), 'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $contact['url']),
'photo_menu' => Contact::photoMenu($rr), 'photo_menu' => Contact::photoMenu($contact),
'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB), 'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
'name' => htmlentities(substr($contact_details['name'], 0, 20)), 'name' => substr($contact_details['name'], 0, 20),
'username' => htmlentities($contact_details['name']), 'username' => $contact_details['name'],
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'account_type' => Contact::getAccountType($contact_details), 'account_type' => Contact::getAccountType($contact_details),
'url' => Contact::magicLink($rr['url']), 'url' => Contact::magicLink($contact['url']),
'sparkle' => '', 'sparkle' => '',
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']), 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $contact['url']),
'network' => ContactSelector::networkToName($rr['network'], $rr['url']), 'network' => ContactSelector::networkToName($contact['network'], $contact['url']),
]; ];
} }
DBA::close($contacts_stmt);
$tpl = Renderer::getMarkupTemplate("viewcontact_template.tpl"); $tpl = Renderer::getMarkupTemplate("viewcontact_template.tpl");
$o .= Renderer::replaceMacros($tpl, [ $o .= Renderer::replaceMacros($tpl, [
'$title' => L10n::t('Contacts'), '$title' => L10n::t('Contacts'),
'$contacts' => $contacts, '$contacts' => $contacts,
'$paginate' => $pager->renderFull($total), '$paginate' => $pager->renderFull($total),
]); ]);