X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fviewcontacts.php;h=f199574c69483945f63f4e632c155aa49ba500d2;hb=9649386c8d3afc0b060a891fab1fcd1fda2444d4;hp=e7d26b73e5c25360eecaf8ef393402b3ff59b444;hpb=aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b;p=friendica.git

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index e7d26b73e5..f199574c69 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) {
@@ -12,6 +13,7 @@ function viewcontacts_init(&$a) {
 
 
 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);
@@ -21,16 +23,16 @@ function viewcontacts_content(&$a) {
 	if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
 		notice( t('Permission denied.') . EOL);
 		return;
-	} 
+	}
 
 
-	$r = q("SELECT COUNT(*) as `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 ",
+	$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'])
 	);
 	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 ORDER BY `name` ASC LIMIT %d , %d ",
+	$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 ",
 		intval($a->profile['uid']),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
@@ -46,7 +48,7 @@ function viewcontacts_content(&$a) {
 		if($rr['self'])
 			continue;
 
-	    $url = $rr['url'];
+		$url = $rr['url'];
 
 		// route DFRN profiles through the redirect
 
@@ -57,16 +59,21 @@ function viewcontacts_content(&$a) {
 		else
 			$url = zrl($url);
 
+		$contact_details = get_contact_details_by_url($rr['url'], $a->profile['uid']);
+
 		$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'],
+			'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
+			'name' => htmlentities(substr($rr['name'],0,20)),
+			'username' => htmlentities($rr['name']),
+			'details'       => $contact_details['location'],
+                        'tags'          => $contact_details['keywords'],
+                        'about'         => $contact_details['about'],
 			'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']),
 		);
 	}