X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fviewcontacts.php;h=1b4ff69c00285ad4b61f6536b0f4db084d479774;hb=57d888f3e716119488722ee6256ccb5da2492d7d;hp=acb51f0cb4c53bf134ce2f0222b59dbb63eca6d8;hpb=9330a6994c1b9aee49a482efe32e84ca1a944c9b;p=friendica.git diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index acb51f0cb4..1b4ff69c00 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -1,11 +1,15 @@ data['user'] = $r[0]; $a->profile_uid = $r[0]['uid']; @@ -27,40 +32,41 @@ function viewcontacts_init(&$a) { profile_load($a,$a->argv[1]); } } -} -if(! function_exists('viewcontacts_content')) { -function viewcontacts_content(&$a) { + +function viewcontacts_content(App $a) { require_once("mod/proxy.php"); - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { notice( t('Public access denied.') . EOL); 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` AND NOT `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` AND NOT `pending` + AND NOT `hidden` AND NOT `archive` AND `network` IN ('%s', '%s', '%s') ORDER BY `name` ASC LIMIT %d, %d", intval($a->profile['uid']), @@ -70,16 +76,18 @@ function viewcontacts_content(&$a) { intval($a->pager['start']), intval($a->pager['itemspage']) ); - if(!count($r)) { + if (!DBM::is_result($r)) { info(t('No contacts.').EOL); return $o; } $contacts = array(); - foreach($r as $rr) { - if($rr['self']) + foreach ($r as $rr) { + /// @TODO This triggers an E_NOTICE if 'self' is not there + if ($rr['self']) { continue; + } $url = $rr['url']; @@ -92,19 +100,19 @@ function viewcontacts_content(&$a) { else $url = zrl($url); - $contact_details = get_contact_details_by_url($rr['url'], $a->profile['uid']); + $contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr); $contacts[] = array( 'id' => $rr['id'], - 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['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']), + 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']), + 'photo_menu' => Contact::photoMenu($rr), + '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' => Contact::getAccountType($contact_details), 'url' => $url, 'sparkle' => '', 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']), @@ -123,4 +131,3 @@ function viewcontacts_content(&$a) { return $o; } -}