X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmsearch.php;h=1e858f1db473504d7ba0ba86f26a40dad46fbe03;hb=b0bf4b435949e923caa5d6d52b12d364bf16ae82;hp=95847760023d29f989f03f3afab0b246d445a2c5;hpb=38e5733b6ee10f5a6dd7f017b6b6e7acfde80565;p=friendica.git

diff --git a/mod/msearch.php b/mod/msearch.php
index 9584776002..1e858f1db4 100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,8 +1,29 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, 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\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\User;
+use Friendica\Util\Proxy;
 
 function msearch_post(App $a)
 {
@@ -26,7 +47,7 @@ function msearch_post(App $a)
 		"SELECT COUNT(*) AS `total`
 			FROM `profile`
 		  	JOIN `user` ON `user`.`uid` = `profile`.`uid`
-			WHERE `user`.`hidewall` = 0
+			WHERE `profile`.`net-publish`
 		  	AND MATCH(`pub_keywords`) AGAINST (?)",
 		$search
 	);
@@ -41,7 +62,7 @@ function msearch_post(App $a)
 		"SELECT `pub_keywords`, `username`, `nickname`, `user`.`uid`
 			FROM `user`
 			JOIN `profile` ON `user`.`uid` = `profile`.`uid`
-			WHERE `user`.`hidewall` = 0
+			WHERE `profile`.`net-publish`
 			AND MATCH(`pub_keywords`) AGAINST (?)
 			LIMIT ?, ?",
 		$search,
@@ -49,15 +70,17 @@ function msearch_post(App $a)
 		$perpage
 	);
 
-	while($search_result = DBA::fetch($search_stmt)) {
+	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);