X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmsearch.php;h=969446ffb524968f77f0acf1afd2528832abf23a;hb=ab77f48b8b4966dc96c97215b4781d9fb32e61a7;hp=48476da4f06542a00d3c101202233c4e035d7543;hpb=7d714319c8d528976eaf48f83d588b9cd12e21c6;p=friendica.git

diff --git a/mod/msearch.php b/mod/msearch.php
index 48476da4f0..969446ffb5 100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,8 @@
 use Friendica\App;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\User;
+use Friendica\Util\Proxy;
 
 function msearch_post(App $a)
 {
@@ -41,42 +43,21 @@ function msearch_post(App $a)
 
 	$total = 0;
 
-	$count_stmt = DBA::p(
-		"SELECT COUNT(*) AS `total`
-			FROM `profile`
-		  	JOIN `user` ON `user`.`uid` = `profile`.`uid`
-			WHERE `user`.`hidewall` = 0
-		  	AND MATCH(`pub_keywords`) AGAINST (?)",
-		$search
-	);
-	if (DBA::isResult($count_stmt)) {
-		$row = DBA::fetch($count_stmt);
-		$total = $row['total'];
-	}
-
-	DBA::close($count_stmt);
+	$condition = ["`net-publish` AND MATCH(`pub_keywords`) AGAINST (?)", $search];
+	$total = DBA::count('owner-view', $condition);
 
-	$search_stmt = DBA::p(
-		"SELECT `pub_keywords`, `username`, `nickname`, `user`.`uid`
-			FROM `user`
-			JOIN `profile` ON `user`.`uid` = `profile`.`uid`
-			WHERE `user`.`hidewall` = 0
-			AND MATCH(`pub_keywords`) AGAINST (?)
-			LIMIT ?, ?",
-		$search,
-		$startrec,
-		$perpage
-	);
-
-	while($search_result = DBA::fetch($search_stmt)) {
+	$search_stmt = DBA::select('owner-view', ['pub_keywords', 'name', 'nickname', 'uid'], $condition, ['limit' => [$startrec, $perpage]]);
+	while ($search_result = DBA::fetch($search_stmt)) {
 		$results[] = [
 			'name'  => $search_result['name'],
 			'url'   => DI::baseUrl() . '/profile/' . $search_result['nickname'],
-			'photo' => DI::baseUrl() . '/photo/avatar/' . $search_result['uid'] . '.jpg',
+			'photo' => User::getAvatarUrl($search_result, Proxy::SIZE_THUMB),
 			'tags'  => str_replace([',', '  '], [' ', ' '], $search_result['pub_keywords'])
 		];
 	}
 
+	DBA::close($search_stmt);
+
 	$output = ['total' => $total, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
 
 	echo json_encode($output);