X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmsearch.php;h=67b8ea6fd59e63760fad9ae02238abc0e0aa82c5;hb=d1be68b75462df77100c9262134b70717635ddfe;hp=64c6ce3cf8a0c2f5a2ad9dfebbb8463b321c2aac;hpb=b962fc989a03083d50e55f96bbcf2349ab390bb0;p=friendica.git

diff --git a/mod/msearch.php b/mod/msearch.php
index 64c6ce3cf8..67b8ea6fd5 100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,14 +1,14 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 
 function msearch_post(App $a)
 {
-	$search = defaults($_POST, 's', '');
-	$perpage  = intval(defaults($_POST, 'n', 80));
-	$page     = intval(defaults($_POST, 'p', 1));
+	$search = $_POST['s'] ?? '';
+	$perpage  = intval(($_POST['n'] ?? 0) ?: 80);
+	$page     = intval(($_POST['p'] ?? 0) ?: 1);
 	$startrec = ($page - 1) * $perpage;
 
 	$total = 0;
@@ -20,6 +20,8 @@ function msearch_post(App $a)
 		exit();
 	}
 
+	$total = 0;
+
 	$count_stmt = DBA::p(
 		"SELECT COUNT(*) AS `total`
 			FROM `profile`
@@ -29,7 +31,6 @@ function msearch_post(App $a)
 		  	AND MATCH(`pub_keywords`) AGAINST (?)",
 		$search
 	);
-
 	if (DBA::isResult($count_stmt)) {
 		$row = DBA::fetch($count_stmt);
 		$total = $row['total'];
@@ -53,8 +54,8 @@ function msearch_post(App $a)
 	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' => DI::baseUrl() . '/photo/avatar/' . $search_result['uid'] . '.jpg',
 			'tags'  => str_replace([',', '  '], [' ', ' '], $search_result['pub_keywords'])
 		];
 	}