better mapping of visible connections

3 files changed, 17 insertions, 23 deletions

diff --git a/include/text.php b/include/text.php
index 63fb76422..68542005b 100755
--- a/include/text.php
+++ b/include/text.php
@@ -707,11 +707,10 @@ function contact_block() {
 
 	if((! is_array($a->profile)) || ($a->profile['hide_friends']))
 		return $o;
-	$r = q("SELECT COUNT(abook_id) AS total 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)",
+	$r = q("SELECT COUNT(abook_id) AS total FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and not ( abook_flags & %d ) and not (xchan_flags & %d)",
 			intval($a->profile['uid']),
-			intval(XCHAN_FLAGS_HIDDEN),
-			intval(XCHAN_FLAGS_ORPHAN),
-			intval(XCHAN_FLAGS_DELETED)
+			intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF),
+			intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED)
 	);
 	if(count($r)) {
 		$total = intval($r[0]['total']);
@@ -722,11 +721,10 @@ function contact_block() {
 		
 	} else {
 
-		$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = 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 RAND() LIMIT %d",
+		$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d) and not (xchan_flags & %d ) ORDER BY RAND() LIMIT %d",
 				intval($a->profile['uid']),
-				intval(XCHAN_FLAGS_HIDDEN),
-				intval(XCHAN_FLAGS_ORPHAN),
-				intval(XCHAN_FLAGS_DELETED),
+				intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF),
+				intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED),
 				intval($shown)
 		);
 
diff --git a/mod/connections.php b/mod/connections.php
index a453203ab..e95f72b49 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -213,12 +213,10 @@ function connections_content(&$a) {
 				nav_set_selected('intros');
 				break;
 			case 'ifpending':
-				$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and not (abook_flags & %d) and not (xchan_flags & %d ) and (abook_flags & %d) and not (abook_flags & %d)",
+				$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and not (abook_flags & %d) and not (xchan_flags & %d )",
 					intval(local_user()),
-					intval(ABOOK_FLAG_SELF),
-					intval(XCHAN_FLAGS_DELETED),
-					intval(ABOOK_FLAG_PENDING),
-					intval(ABOOK_FLAG_IGNORED)		
+					intval(ABOOK_FLAG_SELF|ABOOK_FLAG_PENDING|ABOOK_FLAG_IGNORED),
+					intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN)
 				);
 				if($r && $r[0]['total']) {
 					$search_flags = ABOOK_FLAG_PENDING;
@@ -342,7 +340,7 @@ function connections_content(&$a) {
 		where abook_channel = %d and not (abook_flags & %d) and not (xchan_flags & %d ) $sql_extra $sql_extra2 ",
 		intval(local_user()),
 		intval(ABOOK_FLAG_SELF),
-		intval(XCHAN_FLAGS_DELETED)
+		intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN)
 	);
 	if($r) {
 		$a->set_pager_total($r[0]['total']);
@@ -353,7 +351,7 @@ function connections_content(&$a) {
 		WHERE abook_channel = %d and not (abook_flags & %d) and not ( xchan_flags & %d) $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d , %d ",
 		intval(local_user()),
 		intval(ABOOK_FLAG_SELF),
-		intval(XCHAN_FLAGS_DELETED),
+		intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);
diff --git a/mod/viewconnections.php b/mod/viewconnections.php
index a9fb967f7..f5e7ab213 100644
--- a/mod/viewconnections.php
+++ b/mod/viewconnections.php
@@ -29,21 +29,19 @@ function viewconnections_content(&$a) {
 	} 
 
 
-	$r = q("SELECT count(*) as total 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 ) ",
+	$r = q("SELECT count(*) as total FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d ) and not ( xchan_flags & %d ) ",
 		intval($a->profile['uid']),
-		intval(XCHAN_FLAGS_HIDDEN),
-		intval(XCHAN_FLAGS_ORPHAN),
-		intval(XCHAN_FLAGS_DELETED)
+		intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF),
+		intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED)
 	);
 	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 and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) 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 not ( abook_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(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF),
+		intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);