X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fmsearch.php;h=00a72ea9f72171f75470ae3042fd7c7109192057;hb=1eadcb48552ef0ae1f0bae22103c77b21e2ec517;hp=e87a8f522c8d4ef11aeaa9be41291bc8b58ef48d;hpb=f8c0f24e34e124ab782d5dcf3d2d658d70e19e5c;p=friendica.git

diff --git a/mod/msearch.php b/mod/msearch.php
index e87a8f522c..00a72ea9f7 100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,8 +1,30 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\User;
+use Friendica\Util\Proxy;
 
 function msearch_post(App $a)
 {
@@ -16,53 +38,27 @@ function msearch_post(App $a)
 
 	if (!strlen($search)) {
 		$output = ['total' => 0, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
-		echo json_encode($output);
-		exit();
+		System::jsonExit($output);
 	}
 
 	$total = 0;
 
-	$count_stmt = DBA::p(
-		"SELECT COUNT(*) AS `total`
-			FROM `profile`
-		  	JOIN `user` ON `user`.`uid` = `profile`.`uid`
-			WHERE `is-default` = 1
-			AND `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);
-
-	$search_stmt = DBA::p(
-		"SELECT `pub_keywords`, `username`, `nickname`, `user`.`uid`
-			FROM `user`
-			JOIN `profile` ON `user`.`uid` = `profile`.`uid`
-			WHERE `is-default` = 1
-			AND `user`.`hidewall` = 0
-			AND MATCH(`pub_keywords`) AGAINST (?)
-			LIMIT ?, ?",
-		$search,
-		$startrec,
-		$perpage
-	);
+	$condition = ["`net-publish` AND MATCH(`pub_keywords`) AGAINST (?)", $search];
+	$total = DBA::count('owner-view', $condition);
 
-	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'   => System::baseUrl() . '/profile/' . $search_result['nickname'],
-			'photo' => System::baseUrl() . '/photo/avatar/' . $search_result['uid'] . '.jpg',
+			'url'   => DI::baseUrl() . '/profile/' . $search_result['nickname'],
+			'photo' => User::getAvatarUrl($search_result, Proxy::SIZE_THUMB),
 			'tags'  => str_replace([',', '  '], [' ', ' '], $search_result['pub_keywords'])
 		];
 	}
 
-	$output = ['total' => $total, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
+	DBA::close($search_stmt);
 
-	echo json_encode($output);
+	$output = ['total' => $total, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
 
-	exit();
+	System::jsonExit($output);
 }