X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fviewcontacts.php;h=d16a48e349190f447ac0d3cbf4087ea088f3e164;hb=89c5989cfb679449fb776df7380e972d0f676d8d;hp=e7d26b73e5c25360eecaf8ef393402b3ff59b444;hpb=bb8beb26b4d87c27ce4c8dce3e1229a27a2d1a7e;p=friendica.git

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
old mode 100755
new mode 100644
index e7d26b73e5..d16a48e349
--- 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,22 +23,33 @@ 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 ",
-		intval($a->profile['uid'])
+	$r = q("SELECT COUNT(*) AS `total` FROM `contact`
+		WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+			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 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
+			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 +59,7 @@ function viewcontacts_content(&$a) {
 		if($rr['self'])
 			continue;
 
-	    $url = $rr['url'];
+		$url = $rr['url'];
 
 		// route DFRN profiles through the redirect
 
@@ -57,16 +70,23 @@ 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'],
+			'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']),
+			'details'       => $contact_details['location'],
+			'tags'          => $contact_details['keywords'],
+			'about'         => $contact_details['about'],
+			'account_type'  => (($contact_details['community']) ? t('Forum') : ''),
 			'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']),
 		);
 	}