X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fviewcontacts.php;h=6be1f16de0298fcd589dc49353b436db9aa99858;hb=e20e64390b4e0075c49d9b3b16137a6056e10a16;hp=acb51f0cb4c53bf134ce2f0222b59dbb63eca6d8;hpb=9330a6994c1b9aee49a482efe32e84ca1a944c9b;p=friendica.git

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index acb51f0cb4..6be1f16de0 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -2,7 +2,6 @@
 require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 
-if(! function_exists('viewcontacts_init')) {
 function viewcontacts_init(&$a) {
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
@@ -27,9 +26,8 @@ function viewcontacts_init(&$a) {
 		profile_load($a,$a->argv[1]);
 	}
 }
-}
 
-if(! function_exists('viewcontacts_content')) {
+
 function viewcontacts_content(&$a) {
 	require_once("mod/proxy.php");
 
@@ -38,18 +36,18 @@ function viewcontacts_content(&$a) {
 		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),
@@ -60,7 +58,7 @@ function viewcontacts_content(&$a) {
 		$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']),
@@ -92,19 +90,19 @@ function viewcontacts_content(&$a) {
 		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']),
@@ -123,4 +121,3 @@ function viewcontacts_content(&$a) {
 
 	return $o;
 }
-}