do not show blocked or ignored contacts in connections

1 files changed, 22 insertions, 22 deletions

diff --git a/Zotlabs/Module/Viewconnections.php b/Zotlabs/Module/Viewconnections.php
index a0c293ddf..d54f61c36 100644
--- a/Zotlabs/Module/Viewconnections.php
+++ b/Zotlabs/Module/Viewconnections.php
@@ -6,7 +6,7 @@ require_once('include/selectors.php');
 class Viewconnections extends \Zotlabs\Web\Controller {
 
 	function init() {
-	
+
 		if(observer_prohibited()) {
 			return;
 		}
@@ -16,58 +16,58 @@ class Viewconnections extends \Zotlabs\Web\Controller {
 		}
 
 	}
-	
+
 	function get() {
-	
+
 		if(observer_prohibited()) {
 			notice( t('Public access denied.') . EOL);
 			return;
 		}
-	
+
 		if(((! count(\App::$profile)) || (\App::$profile['hide_friends']))) {
 			notice( t('Permission denied.') . EOL);
 			return;
-		} 
-	
+		}
+
 		if(! perm_is_allowed(\App::$profile['uid'], get_observer_hash(),'view_contacts')) {
 			notice( t('Permission denied.') . EOL);
 			return;
-		} 
-	
+		}
+
 		if(! $_REQUEST['aj'])
 			$_SESSION['return_url'] = \App::$query_string;
-	
-	
+
+
 		$is_owner = ((local_channel() && local_channel() == \App::$profile['uid']) ? true : false);
-	
-		$abook_flags = " and abook_pending = 0 and abook_self = 0 ";
+
+		$abook_flags = " and abook_pending = 0 and abook_self = 0 and abook_blocked = 0 and abook_ignored = 0 ";
 		$sql_extra = '';
-	
+
 		if(! $is_owner) {
 			$abook_flags .= " and abook_hidden = 0 ";
 			$sql_extra = " and xchan_hidden = 0 ";
 		}
-	
+
 		$r = q("SELECT count(*) as total FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d $abook_flags and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra ",
 			intval(\App::$profile['uid'])
 		);
 		if($r) {
 			\App::set_pager_total($r[0]['total']);
 		}
-	
+
 		$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d $abook_flags and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra order by xchan_name LIMIT %d OFFSET %d ",
 			intval(\App::$profile['uid']),
 			intval(\App::$pager['itemspage']),
 			intval(\App::$pager['start'])
 		);
-	
+
 		if((! $r) && (! $_REQUEST['aj'])) {
 			info( t('No connections.') . EOL );
 			return $o;
 		}
-	
+
 		$contacts = array();
-	
+
 		foreach($r as $rr) {
 
 			$oneway = false;
@@ -103,7 +103,7 @@ class Viewconnections extends \Zotlabs\Web\Controller {
 					'id' => $rr['abook_id'],
 					'archived' => (intval($rr['abook_archived']) ? true : false),
 					'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['xchan_name'], $rr['xchan_url']),
-					'thumb' => $rr['xchan_photo_m'], 
+					'thumb' => $rr['xchan_photo_m'],
 					'name' => substr($rr['xchan_name'],0,20),
 					'username' => $rr['xchan_addr'],
 					'link' => $url,
@@ -137,11 +137,11 @@ class Viewconnections extends \Zotlabs\Web\Controller {
 	//			'$paginate' => paginate($a),
 			));
 		}
-	
+
 	    if(! $contacts)
 	        $o .= '<div id="content-complete"></div>';
-	
+
 		return $o;
 	}
-	
+
 }