the rest of the fix

1 files changed, 24 insertions, 24 deletions

diff --git a/mod/search_ac.php b/mod/search_ac.php
index 308f42f76..21ff1c9f3 100644
--- a/mod/search_ac.php
+++ b/mod/search_ac.php
@@ -27,19 +27,18 @@ function search_ac_init(&$a){
 	// Priority to people searches
 
 	if ($search) {
-		$people_sql_extra = protect_sprintf(" AND `xchan_name` LIKE '%". dbesc($search) . "%' ");
+		$people_sql_extra = protect_sprintf(" AND `name` LIKE '%". dbesc($search) . "%' ");
 		$tag_sql_extra = protect_sprintf(" AND term LIKE '%". dbesc($search) . "%' ");
 	}
 
-
-    $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms
-		FROM abook left join xchan on abook_xchan = xchan_hash
-		WHERE abook_channel = %d AND not ( abook_flags & %d ) $people_sql_extra order by xchan_name asc" ,
-		intval(local_user()),
-		intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED)
+	$r = q("SELECT `id`, `name`, `micro`, `url` FROM `contact` 
+		WHERE `uid` = %d AND `pending` = 0
+		$people_sql_extra
+		ORDER BY `name` ASC ",
+		intval(local_user())
 	);
 
-	if($r) {
+	if(count($r)) {
 		foreach($r as $g) {
 			$x['photos'][] = $g['micro'];
 			$x['links'][] = $g['url'];
@@ -47,22 +46,23 @@ function search_ac_init(&$a){
 			$x['data'][] = intval($g['id']);
 		}
 	}
-	else {
-
-		$r = q("SELECT `id`, `name`, `photo`, `url` FROM `gcontact` where 1
-			$people_sql_extra
-			ORDER BY `name` ASC "
-		);
-
-		if(count($r)) {
-			foreach($r as $g) {
-				$x['photos'][] = $g['photo'];
-				$x['links'][] = $g['url'];
-				$x['suggestions'][] = '@' . $g['name'];
-				$x['data'][] = intval($g['id']);
-			}
-		}
-	}
+// FIXME - extend search to non-connnections if you couldn't find any connections with that name, use poco or directory
+//	else {
+//
+//		$r = q("SELECT `id`, `name`, `photo`, `url` FROM `gcontact` where 1
+//			$people_sql_extra
+//			ORDER BY `name` ASC "
+//		);
+
+//		if(count($r)) {
+//			foreach($r as $g) {
+//				$x['photos'][] = $g['photo'];
+//				$x['links'][] = $g['url'];
+//				$x['suggestions'][] = '@' . $g['name'];
+//				$x['data'][] = intval($g['id']);
+//			}
+//		}
+//	}
 
 	$r = q("select tid, term, url from term where type = %d $tag_sql_extra order by term asc",
 		intval(TERM_HASHTAG)