X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmsearch.php;h=a652bc8ed87b92d86a646a3043b932b1f79ea65a;hb=93ca0d79fe3f68e2b9942b1c251475065add2f81;hp=94def7d89c8d238954dcfd843de86d6a92369bd3;hpb=4bee1859be5fbf46ecc19728a908e31b4e9b09b6;p=friendica.git

diff --git a/mod/msearch.php b/mod/msearch.php
index 94def7d89c..a652bc8ed8 100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,6 +1,10 @@
 <?php
 
-function msearch_post(&$a) {
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
+function msearch_post(App $a) {
 
 	$perpage = (($_POST['n']) ? $_POST['n'] : 80);
 	$page = (($_POST['p']) ? intval($_POST['p'] - 1) : 0);
@@ -13,22 +17,24 @@ function msearch_post(&$a) {
 	$r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') ",
 		dbesc($search)
 	);
-	if(count($r))
+
+	if (DBM::is_result($r))
 		$total = $r[0]['total'];
 
+	$results = array();
+
 	$r = q("SELECT `pub_keywords`, `username`, `nickname`, `user`.`uid` FROM `user` LEFT JOIN `profile` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') LIMIT %d , %d ",
 		dbesc($search),
 		intval($startrec),
 		intval($perpage)
 	);
 
-	$results = array();
-	if(count($r)) {
+	if (DBM::is_result($r)) {
 		foreach($r as $rr)
 			$results[] = array(
-				'name' => $rr['name'], 
-				'url' => $a->get_baseurl() . '/profile/' . $rr['nickname'], 
-				'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'] . 'jpg',
+				'name' => $rr['name'],
+				'url' => System::baseUrl() . '/profile/' . $rr['nickname'],
+				'photo' => System::baseUrl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
 				'tags' => str_replace(array(',','  '),array(' ',' '),$rr['pub_keywords'])
 			);
 	}
@@ -39,4 +45,4 @@ function msearch_post(&$a) {
 
 	killme();
 
-}
\ No newline at end of file
+}