MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

preg_quote search strings

Browse source
This commit is contained in:
friendica 2011-12-06 19:51:19 -08:00
parent 7eba8adbf7
commit 341fcce75e
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/network.php
View file

@ -364,8 +364,8 @@ function network_content(&$a, $update = 0) {
if(x($_GET,'search')) {
$search = escape_tags($_GET['search']);
$sql_extra .= sprintf(" AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) ",
dbesc($search),
dbesc('\\]' . $search . '\\[')
dbesc(preg_quote($search)),
dbesc('\\]' . preg_quote($search) . '\\[')
);
}

11
mod/search.php
View file

@ -96,17 +96,10 @@ function search_content(&$a) {
// Only public wall posts can be shown
// OR your own posts if you are a logged in member
$escaped_search = str_replace(array('[',']'),array('\\[','\\]'),$search);
// $s_bool = sprintf("AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )", dbesc($search));
$s_regx = sprintf("AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )",
dbesc($escaped_search), dbesc('\\]' . $escaped_search . '\\['));
dbesc(preg_quote($search)), dbesc('\\]' . preg_quote($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`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`