X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=984167fd78dc8367342519076c89c3f1f987dfc2;hb=de4a2e6fd03cd0aab94a256eba92ed593931534b;hp=c15dfae3fea8d981cf74efe685f9fef59078413f;hpb=2840bf22931acc060b57d2da99eb65ae3cf338e7;p=friendica.git diff --git a/mod/search.php b/mod/search.php index c15dfae3fe..984167fd78 100644 --- a/mod/search.php +++ b/mod/search.php @@ -1,4 +1,10 @@ $rr['id'], 'term' => $rr['term'], @@ -43,34 +49,27 @@ function search_saved_searches() { } -function search_init(&$a) { +function search_init(App $a) { $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); - if(local_user()) { - if(x($_GET,'save') && $search) { + if (local_user()) { + if (x($_GET,'save') && $search) { $r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1", intval(local_user()), dbesc($search) ); - if(! count($r)) { - q("INSERT INTO `search` (`uid`,`term`) VALUES ( %d, '%s')", - intval(local_user()), - dbesc($search) - ); + if (!DBM::is_result($r)) { + dba::insert('search', array('uid' => local_user(), 'term' => $search)); } } - if(x($_GET,'remove') && $search) { - q("delete from `search` where `uid` = %d and `term` = '%s' limit 1", - intval(local_user()), - dbesc($search) - ); + if (x($_GET,'remove') && $search) { + dba::delete('search', array('uid' => local_user(), 'term' => $search)); } $a->page['aside'] .= search_saved_searches(); - } - else { + } else { unset($_SESSION['theme']); unset($_SESSION['mobile-theme']); } @@ -81,20 +80,20 @@ function search_init(&$a) { -function search_post(&$a) { - if(x($_POST,'search')) +function search_post(App $a) { + if (x($_POST,'search')) $a->data['search'] = $_POST['search']; } -function search_content(&$a) { +function search_content(App $a) { - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { - notice( t('Public access denied.') . EOL); + if (Config::get('system','block_public') && !local_user() && !remote_user()) { + notice(t('Public access denied.') . EOL); return; } - if(get_config('system','local_search') AND !local_user()) { + if (Config::get('system','local_search') && !local_user() && !remote_user()) { http_status_exit(403, array("title" => t("Public access denied."), "description" => t("Only logged in users are permitted to perform a search."))); @@ -103,54 +102,66 @@ function search_content(&$a) { //return; } - if (get_config('system','permit_crawling') AND !local_user()) { - // To-Do: - // - 10 requests are "free", after the 11th only a call per minute is allowed + if (Config::get('system','permit_crawling') && !local_user() && !remote_user()) { + // Default values: + // 10 requests are "free", after the 11th only a call per minute is allowed + + $free_crawls = intval(Config::get('system','free_crawls')); + if ($free_crawls == 0) + $free_crawls = 10; + + $crawl_permit_period = intval(Config::get('system','crawl_permit_period')); + if ($crawl_permit_period == 0) + $crawl_permit_period = 10; $remote = $_SERVER["REMOTE_ADDR"]; $result = Cache::get("remote_search:".$remote); if (!is_null($result)) { - if ($result > (time() - 60)) { + $resultdata = json_decode($result); + if (($resultdata->time > (time() - $crawl_permit_period)) && ($resultdata->accesses > $free_crawls)) { http_status_exit(429, array("title" => t("Too Many Requests"), "description" => t("Only one search per minute is permitted for not logged in users."))); killme(); } - } - Cache::set("remote_search:".$remote, time(), CACHE_HOUR); + Cache::set("remote_search:".$remote, json_encode(array("time" => time(), "accesses" => $resultdata->accesses + 1)), CACHE_HOUR); + } else + Cache::set("remote_search:".$remote, json_encode(array("time" => time(), "accesses" => 1)), CACHE_HOUR); } nav_set_selected('search'); - - $o = '

' . t('Search') . '

'; - - if(x($a->data,'search')) + if (x($a->data,'search')) $search = notags(trim($a->data['search'])); else $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); $tag = false; - if(x($_GET,'tag')) { + if (x($_GET,'tag')) { $tag = true; $search = ((x($_GET,'tag')) ? notags(trim(rawurldecode($_GET['tag']))) : ''); } + // contruct a wrapper for the search header + $o .= replace_macros(get_markup_template("content_wrapper.tpl"),array( + 'name' => "search-header", + '$title' => t("Search"), + '$title_size' => 3, + '$content' => search($search,'search-box','search',((local_user()) ? true : false), false) + )); - $o .= search($search,'search-box','/search',((local_user()) ? true : false), false); - - if(strpos($search,'#') === 0) { + if (strpos($search,'#') === 0) { $tag = true; $search = substr($search,1); } - if(strpos($search,'@') === 0) { + if (strpos($search,'@') === 0) { return dirfind_content($a); } - if(strpos($search,'!') === 0) { + if (strpos($search,'!') === 0) { return dirfind_content($a); } - if(x($_GET,'search-option')) + if (x($_GET,'search-option')) switch($_GET['search-option']) { case 'fulltext': break; @@ -165,10 +176,10 @@ function search_content(&$a) { break; } - if(! $search) + if (! $search) return $o; - if (get_config('system','only_tag_search')) + if (Config::get('system','only_tag_search')) $tag = true; // Here is the way permissions work in the search module... @@ -176,54 +187,43 @@ function search_content(&$a) { // OR your own posts if you are a logged in member // No items will be shown if the member has a blocked profile wall. - if($tag) { + if ($tag) { logger("Start tag search for '".$search."'", LOGGER_DEBUG); - $r = q("SELECT STRAIGHT_JOIN `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, - `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, - `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` + $r = q("SELECT %s FROM `term` - INNER JOIN `item` ON `item`.`id`=`term`.`oid` - INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND NOT `contact`.`pending` - WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` - AND (`term`.`uid` = 0 OR (`term`.`uid` = %d AND NOT `term`.`global`)) AND `term`.`otype` = %d AND `term`.`type` = %d AND `term`.`term` = '%s' + STRAIGHT_JOIN `item` ON `item`.`id`=`term`.`oid` %s + WHERE %s AND (`term`.`uid` = 0 OR (`term`.`uid` = %d AND NOT `term`.`global`)) AND `term`.`otype` = %d AND `term`.`type` = %d AND `term`.`term` = '%s' ORDER BY term.created DESC LIMIT %d , %d ", - intval(local_user()), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), dbesc(protect_sprintf($search)), + item_fieldlists(), item_joins(), item_condition(), + intval(local_user()), + intval(TERM_OBJ_POST), intval(TERM_HASHTAG), dbesc(protect_sprintf($search)), intval($a->pager['start']), intval($a->pager['itemspage'])); } else { logger("Start fulltext search for '".$search."'", LOGGER_DEBUG); - if (get_config('system','use_fulltext_engine')) { - $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); - } else { - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); - } + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); - $r = q("SELECT STRAIGHT_JOIN `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, - `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, - `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` - FROM `item` - INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND NOT `contact`.`pending` - WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` - AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND (`item`.`private` OR NOT `item`.`network` IN ('%s', '%s', '%s')))) + $r = q("SELECT %s + FROM `item` %s + WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`)) $sql_extra - GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d ", - intval(local_user()), dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), + GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d", + item_fieldlists(), item_joins(), item_condition(), + intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage'])); } - if(! count($r)) { + if (! DBM::is_result($r)) { info( t('No results.') . EOL); return $o; } - if($tag) + if ($tag) $title = sprintf( t('Items tagged with: %s'), $search); else - $title = sprintf( t('Search results for: %s'), $search); + $title = sprintf( t('Results for: %s'), $search); $o .= replace_macros(get_markup_template("section_title.tpl"),array( '$title' => $title