1 files changed, 17 insertions, 30 deletions

diff --git a/mod/viewconnections.php b/mod/viewconnections.php
index e6c739562..4f6f81d82 100644
--- a/mod/viewconnections.php
+++ b/mod/viewconnections.php
@@ -11,17 +11,6 @@ function viewconnections_init(&$a) {
 		profile_load($a,argv(1));
 }
 
-
-function viewconnections_aside(&$a) {
-
-	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-		return;
-	}
-
-	profile_create_sidebar($a);
-}
-
-
 function viewconnections_content(&$a) {
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
@@ -41,14 +30,11 @@ function viewconnections_content(&$a) {
 
 
 
-	$r = q("SELECT COUNT(abook_id) as total FROM abook WHERE abook_channel = %d AND abook_flags = 0 ",
-		intval($a->profile['uid'])
-	);
-	if($r)
-		$a->set_pager_total($r[0]['total']);
-
-	$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_flags = 0 order by xchan_name LIMIT %d , %d ",
+	$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_flags = 0 and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) order by xchan_name LIMIT %d , %d ",
 		intval($a->profile['uid']),
+		intval(XCHAN_FLAGS_HIDDEN),
+		intval(XCHAN_FLAGS_ORPHAN),
+		intval(XCHAN_FLAGS_DELETED),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);
@@ -63,18 +49,19 @@ function viewconnections_content(&$a) {
 	foreach($r as $rr) {
 
 	    $url = zid($rr['xchan_url']);
-
-		$contacts[] = array(
-			'id' => $rr['abook_id'],
-			'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['xchan_name'], $rr['xchan_url']),
-			'thumb' => $rr['xchan_photo_m'], 
-			'name' => substr($rr['xchan_name'],0,20),
-			'username' => $rr['xchan_addr'],
-			'url' => $url,
-			'sparkle' => '',
-			'itemurl' => $rr['url'],
-			'network' => '',
-		);
+		if($url) {
+			$contacts[] = array(
+				'id' => $rr['abook_id'],
+				'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['xchan_name'], $rr['xchan_url']),
+				'thumb' => $rr['xchan_photo_m'], 
+				'name' => substr($rr['xchan_name'],0,20),
+				'username' => $rr['xchan_addr'],
+				'link' => $url,
+				'sparkle' => '',
+				'itemurl' => $rr['url'],
+				'network' => '',
+			);
+		}
 	}