require_once('include/Contact.php');
require_once('include/contact_selectors.php');
-function viewcontacts_init(&$a) {
+function viewcontacts_init(App &$a) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
return;
dbesc($nick)
);
- if(! count($r))
+ if (! dbm::is_result($r)) {
return;
+ }
$a->data['user'] = $r[0];
$a->profile_uid = $r[0]['uid'];
}
-function viewcontacts_content(&$a) {
+function viewcontacts_content(App &$a) {
require_once("mod/proxy.php");
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
return;
}
- if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
- notice( t('Permission denied.') . EOL);
- return;
- }
-
$o = "";
// tabs
$o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']);
+ if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
+ notice( t('Permission denied.') . EOL);
+ return $o;
+ }
+
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
- WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+ WHERE `uid` = %d AND (NOT `blocked` OR `pending`) AND NOT `hidden` AND NOT `archive`
AND `network` IN ('%s', '%s', '%s')",
intval($a->profile['uid']),
dbesc(NETWORK_DFRN),
dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_OSTATUS)
);
- if(count($r))
+ if (dbm::is_result($r))
$a->set_pager_total($r[0]['total']);
$r = q("SELECT * FROM `contact`
- WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+ WHERE `uid` = %d AND (NOT `blocked` OR `pending`) AND NOT `hidden` AND NOT `archive`
AND `network` IN ('%s', '%s', '%s')
ORDER BY `name` ASC LIMIT %d, %d",
intval($a->profile['uid']),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
- if(!count($r)) {
+ if (!dbm::is_result($r)) {
info(t('No contacts.').EOL);
return $o;
}
else
$url = zrl($url);
- $contact_details = get_contact_details_by_url($rr['url'], $a->profile['uid']);
+ $contact_details = get_contact_details_by_url($rr['url'], $a->profile['uid'], $rr);
$contacts[] = array(
'id' => $rr['id'],
- 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']),
+ 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
'photo_menu' => contact_photo_menu($rr),
- 'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
- 'name' => htmlentities(substr($rr['name'],0,20)),
- 'username' => htmlentities($rr['name']),
+ 'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+ 'name' => htmlentities(substr($contact_details['name'],0,20)),
+ 'username' => htmlentities($contact_details['name']),
'details' => $contact_details['location'],
'tags' => $contact_details['keywords'],
'about' => $contact_details['about'],
- 'account_type' => (($contact_details['community']) ? t('Forum') : ''),
+ 'account_type' => account_type($contact_details),
'url' => $url,
'sparkle' => '',
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),