nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rework mod/msearch

Browse source 
- Remove deprecated q()/killme() calls
- Ensure an output on empty search string
- Fix page number nonsense (-1, +1,...)
This commit is contained in:
Hypolite Petovan 2018-12-23 19:45:03 -05:00
parent 1938ec3ebe
commit b962fc989a
1 changed files with 52 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
mod/msearch.php
View file

@ -4,45 +4,64 @@ use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
function msearch_post(App $a) { function msearch_post(App $a)
{
$perpage = (($_POST['n']) ? $_POST['n'] : 80); $search = defaults($_POST, 's', '');
$page = (($_POST['p']) ? intval($_POST['p'] - 1) : 0); $perpage = intval(defaults($_POST, 'n', 80));
$startrec = (($page+1) * $perpage) - $perpage; $page = intval(defaults($_POST, 'p', 1));
$startrec = ($page - 1) * $perpage;
$search = $_POST['s'];
if(! strlen($search))
killme();
$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') ",
DBA::escape($search)
);
if (DBA::isResult($r))
$total = $r[0]['total'];
$total = 0;
$results = []; $results = [];
$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 ", if (!strlen($search)) {
DBA::escape($search), $output = ['total' => 0, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
intval($startrec), echo json_encode($output);
intval($perpage) exit();
);
if (DBA::isResult($r)) {
foreach($r as $rr)
$results[] = [
'name' => $rr['name'],
'url' => System::baseUrl() . '/profile/' . $rr['nickname'],
'photo' => System::baseUrl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
'tags' => str_replace([',',' '],[' ',' '],$rr['pub_keywords'])
];
} }
$output = ['total' => $total, 'items_page' => $perpage, 'page' => $page + 1, 'results' => $results]; $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'];
}
DBA::close($count_stmt);
$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
);
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 = ['total' => $total, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
echo json_encode($output); echo json_encode($output);
killme(); exit();
} }