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

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 8e261e7115..6be1f16de0 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -1,4 +1,5 @@
 <?php
+require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 
 function viewcontacts_init(&$a) {
@@ -7,36 +8,68 @@ function viewcontacts_init(&$a) {
 		return;
 	}
 
-	profile_load($a,$a->argv[1]);
+	nav_set_selected('home');
+
+	if($a->argc > 1) {
+		$nick = $a->argv[1];
+		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
+			dbesc($nick)
+		);
+
+		if(! count($r))
+			return;
+
+		$a->data['user'] = $r[0];
+		$a->profile_uid = $r[0]['uid'];
+		$is_owner = (local_user() && (local_user() == $a->profile_uid));
+
+		profile_load($a,$a->argv[1]);
+	}
 }
 
 
 function viewcontacts_content(&$a) {
+	require_once("mod/proxy.php");
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access 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;
-	} 
-
+		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 ",
-		intval($a->profile['uid'])
+	$r = q("SELECT COUNT(*) AS `total` FROM `contact`
+		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))
 		$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 ORDER BY `name` ASC LIMIT %d , %d ",
+	$r = q("SELECT * FROM `contact`
+		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']),
+		dbesc(NETWORK_DFRN),
+		dbesc(NETWORK_DIASPORA),
+		dbesc(NETWORK_OSTATUS),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);
-	if(! count($r)) {
-		info( t('No contacts.') . EOL );
+	if(!count($r)) {
+		info(t('No contacts.').EOL);
 		return $o;
 	}
 
@@ -46,7 +79,7 @@ function viewcontacts_content(&$a) {
 		if($rr['self'])
 			continue;
 
-	    $url = $rr['url'];
+		$url = $rr['url'];
 
 		// route DFRN profiles through the redirect
 
@@ -57,23 +90,30 @@ function viewcontacts_content(&$a) {
 		else
 			$url = zrl($url);
 
+		$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']),
-			'thumb' => $rr['thumb'], 
-			'name' => substr($rr['name'],0,20),
-			'username' => $rr['name'],
+			'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
+			'photo_menu' => contact_photo_menu($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'  => account_type($contact_details),
 			'url' => $url,
 			'sparkle' => '',
-			'itemurl' => $rr['url'],
-			'network' => network_to_name($rr['network']),
+			'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+			'network' => network_to_name($rr['network'], $rr['url']),
 		);
 	}
 
 
 	$tpl = get_markup_template("viewcontact_template.tpl");
 	$o .= replace_macros($tpl, array(
-		'$title' => t('View Contacts'),
+		'$title' => t('Contacts'),
 		'$contacts' => $contacts,
 		'$paginate' => paginate($a),
 	));