keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

shared tag search

Browse source
This commit is contained in:
Friendika 2011-10-23 21:37:11 -07:00
parent fe2c8a1845
commit 87aedacec7
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mod/search.php
View file

@ -96,12 +96,15 @@ function search_content(&$a) {
// Only public wall posts can be shown // Only public wall posts can be shown
// OR your own posts if you are a logged in member // OR your own posts if you are a logged in member
$s_bool = "AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )";
$s_regx = "AND `item`.`body` REGEXP '%s' ";
if(mb_strlen($search) >= 3) // $s_bool = sprintf("AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )", dbesc($search));
$search_alg = $s_bool; $s_regx = sprintf("AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )",
else dbesc($search), dbesc('\\]' . $search . '\\['));
// if(mb_strlen($search) >= 3)
// $search_alg = $s_bool;
// else
$search_alg = $s_regx; $search_alg = $s_regx;
$r = q("SELECT COUNT(*) AS `total` $r = q("SELECT COUNT(*) AS `total`
@ -111,8 +114,7 @@ function search_content(&$a) {
OR `item`.`uid` = %d ) OR `item`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$search_alg ", $search_alg ",
intval(local_user()), intval(local_user())
dbesc($search)
); );
if(count($r)) if(count($r))
@ -137,7 +139,6 @@ function search_content(&$a) {
$search_alg $search_alg
ORDER BY `received` DESC LIMIT %d , %d ", ORDER BY `received` DESC LIMIT %d , %d ",
intval(local_user()), intval(local_user()),
dbesc($search),
intval($a->pager['start']), intval($a->pager['start']),
intval($a->pager['itemspage']) intval($a->pager['itemspage'])