Merge pull request #7988 from friendica/MrPetovan-notice

[friendica.git] / mod / msearch.php

diff --git a/mod/msearch.php b/mod/msearch.php
index ba7a92d64e26fa697043b4d1e230d1bea38cc278..e87a8f522c8d4ef11aeaa9be41291bc8b58ef48d 100644 (file)
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,44 +1,68 @@
 <?php
 
-function msearch_post(&$a) {
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
 
-       $perpage = (($_POST['n']) ? $_POST['n'] : 80);
-       $page = (($_POST['p']) ? intval($_POST['p'] - 1) : 0);
-       $startrec = (($page+1) * $perpage) - $perpage;
+function msearch_post(App $a)
+{
+       $search = $_POST['s'] ?? '';
+       $perpage  = intval(($_POST['n'] ?? 0) ?: 80);
+       $page     = intval(($_POST['p'] ?? 0) ?: 1);
+       $startrec = ($page - 1) * $perpage;
 
-       $search = $_POST['s'];
-       if(! strlen($search))
-               killme();
+       $total = 0;
+       $results = [];
 
-       $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 (!strlen($search)) {
+               $output = ['total' => 0, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
+               echo json_encode($output);
+               exit();
+       }
+
+       $total = 0;
 
-       if (dbm::is_result($r))
-               $total = $r[0]['total'];
+       $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'];
+       }
 
-       $results = array();
+       DBA::close($count_stmt);
 
-       $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)
+       $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
        );
 
-       if (dbm::is_result($r)) {
-               foreach($r as $rr)
-                       $results[] = array(
-                               'name' => $rr['name'], 
-                               'url' => App::get_baseurl() . '/profile/' . $rr['nickname'], 
-                               'photo' => App::get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
-                               'tags' => str_replace(array(',','  '),array(' ',' '),$rr['pub_keywords'])
-                       );
+       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',
+                       'tags'  => str_replace([',', '  '], [' ', ' '], $search_result['pub_keywords'])
+               ];
        }
 
-       $output = array('total' => $total, 'items_page' => $perpage, 'page' => $page + 1, 'results' => $results);
+       $output = ['total' => $total, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
 
        echo json_encode($output);
 
-       killme();
-
+       exit();
 }