Force avatar update for Contact Advanced page

[friendica.git] / mod / msearch.php

diff --git a/mod/msearch.php b/mod/msearch.php
index 64c6ce3cf8a0c2f5a2ad9dfebbb8463b321c2aac..95847760023d29f989f03f3afab0b246d445a2c5 100644 (file)
--- 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,16 +20,16 @@ function msearch_post(App $a)
                exit();
        }
 
+       $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
+                       WHERE `user`.`hidewall` = 0
                        AND MATCH(`pub_keywords`) AGAINST (?)",
                $search
        );
-
        if (DBA::isResult($count_stmt)) {
                $row = DBA::fetch($count_stmt);
                $total = $row['total'];
@@ -41,8 +41,7 @@ function msearch_post(App $a)
                "SELECT `pub_keywords`, `username`, `nickname`, `user`.`uid`
                        FROM `user`
                        JOIN `profile` ON `user`.`uid` = `profile`.`uid`
-                       WHERE `is-default` = 1
-                       AND `user`.`hidewall` = 0
+                       WHERE `user`.`hidewall` = 0
                        AND MATCH(`pub_keywords`) AGAINST (?)
                        LIMIT ?, ?",
                $search,
@@ -53,8 +52,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'])
                ];
        }