X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=64336e3487b0e78e34d304d37a86304e9b7d2630;hb=8dc5b04be7cd9cb2eb77ed9824815efe27369bee;hp=df604e367c7724a46118dec997da42e1183b5fce;hpb=12dd06f72677321006e8327636f517a2cb13fc13;p=friendica.git diff --git a/mod/search.php b/mod/search.php index df604e367c..64336e3487 100644 --- a/mod/search.php +++ b/mod/search.php @@ -1,41 +1,55 @@ $rr['id'], 'term' => $rr['term'], 'encodedterm' => urlencode($rr['term']), - 'delete' => t('Remove term'), + 'delete' => L10n::t('Remove term'), 'selected' => ($search==$rr['term']), - ); + ]; } $tpl = get_markup_template("saved_searches_aside.tpl"); - $o .= replace_macros($tpl, array( - '$title' => t('Saved Searches'), + $o .= replace_macros($tpl, [ + '$title' => L10n::t('Saved Searches'), '$add' => '', '$searchbox' => '', '$saved' => $saved, - )); + ]); } return $o; @@ -47,30 +61,28 @@ 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) + DBA::escape($search) ); - if (! dbm::is_result($r)) { - q("INSERT INTO `search` (`uid`,`term`) VALUES ( %d, '%s')", - intval(local_user()), - dbesc($search) - ); + if (!DBA::isResult($r)) { + DBA::insert('search', ['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', ['uid' => local_user(), 'term' => $search]); + } + + /// @todo Check if there is a case at all that "aside" is prefilled here + if (!isset($a->page['aside'])) { + $a->page['aside'] = ''; } $a->page['aside'] .= search_saved_searches(); - } - else { + } else { unset($_SESSION['theme']); unset($_SESSION['mobile-theme']); } @@ -82,36 +94,36 @@ function search_init(App $a) { function search_post(App $a) { - if(x($_POST,'search')) + if (x($_POST,'search')) $a->data['search'] = $_POST['search']; } 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(L10n::t('Public access denied.') . EOL); return; } - if(get_config('system','local_search') AND !local_user()) { - http_status_exit(403, - array("title" => t("Public access denied."), - "description" => t("Only logged in users are permitted to perform a search."))); + if (Config::get('system','local_search') && !local_user() && !remote_user()) { + System::httpExit(403, + ["title" => L10n::t("Public access denied."), + "description" => L10n::t("Only logged in users are permitted to perform a search.")]); killme(); - //notice(t('Public access denied.').EOL); + //notice(L10n::t('Public access denied.').EOL); //return; } - if (get_config('system','permit_crawling') AND !local_user()) { + 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(get_config('system','free_crawls')); + $free_crawls = intval(Config::get('system','free_crawls')); if ($free_crawls == 0) $free_crawls = 10; - $crawl_permit_period = intval(get_config('system','crawl_permit_period')); + $crawl_permit_period = intval(Config::get('system','crawl_permit_period')); if ($crawl_permit_period == 0) $crawl_permit_period = 10; @@ -119,50 +131,51 @@ function search_content(App $a) { $result = Cache::get("remote_search:".$remote); if (!is_null($result)) { $resultdata = json_decode($result); - if (($resultdata->time > (time() - $crawl_permit_period)) AND ($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."))); + if (($resultdata->time > (time() - $crawl_permit_period)) && ($resultdata->accesses > $free_crawls)) { + System::httpExit(429, + ["title" => L10n::t("Too Many Requests"), + "description" => L10n::t("Only one search per minute is permitted for not logged in users.")]); killme(); } - Cache::set("remote_search:".$remote, json_encode(array("time" => time(), "accesses" => $resultdata->accesses + 1)), CACHE_HOUR); + Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => $resultdata->accesses + 1]), CACHE_HOUR); } else - Cache::set("remote_search:".$remote, json_encode(array("time" => time(), "accesses" => 1)), CACHE_HOUR); + Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => 1]), CACHE_HOUR); } - nav_set_selected('search'); + Nav::setSelected('search'); - if(x($a->data,'search')) + $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']))) : ''); + $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( + $o = replace_macros(get_markup_template("content_wrapper.tpl"),[ 'name' => "search-header", - '$title' => t("Search"), + '$title' => L10n::t("Search"), '$title_size' => 3, '$content' => 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; @@ -177,10 +190,10 @@ function search_content(App $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... @@ -188,54 +201,59 @@ function search_content(App $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 %s - FROM `term` - 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 ", - 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); + $condition = ["(`uid` = 0 OR (`uid` = ? AND NOT `global`)) + AND `otype` = ? AND `type` = ? AND `term` = ?", + local_user(), TERM_OBJ_POST, TERM_HASHTAG, $search]; + $params = ['order' => ['created' => true], + 'limit' => [$a->pager['start'], $a->pager['itemspage']]]; + $terms = DBA::select('term', ['oid'], $condition, $params); + + $itemids = []; + while ($term = DBA::fetch($terms)) { + $itemids[] = $term['oid']; + } + DBA::close($terms); - 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))); + if (!empty($itemids)) { + $params = ['order' => ['id' => true]]; + $items = Item::selectForUser(local_user(), [], ['id' => $itemids], $params); + $r = Item::inArray($items); } else { - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); + $r = []; } + } else { + logger("Start fulltext search for '".$search."'", LOGGER_DEBUG); - $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", - item_fieldlists(), item_joins(), item_condition(), - intval(local_user()), - intval($a->pager['start']), intval($a->pager['itemspage'])); + $condition = ["(`uid` = 0 OR (`uid` = ? AND NOT `global`)) + AND `body` LIKE CONCAT('%',?,'%')", + local_user(), $search]; + $params = ['order' => ['id' => true], + 'limit' => [$a->pager['start'], $a->pager['itemspage']]]; + $items = Item::selectForUser(local_user(), [], $condition, $params); + $r = Item::inArray($items); } - if (! dbm::is_result($r)) { - info( t('No results.') . EOL); + if (!DBA::isResult($r)) { + info(L10n::t('No results.') . EOL); return $o; } - if($tag) - $title = sprintf( t('Items tagged with: %s'), $search); - else - $title = sprintf( t('Results for: %s'), $search); + if ($tag) { + $title = L10n::t('Items tagged with: %s', $search); + } else { + $title = L10n::t('Results for: %s', $search); + } - $o .= replace_macros(get_markup_template("section_title.tpl"),array( + $o .= replace_macros(get_markup_template("section_title.tpl"),[ '$title' => $title - )); + ]); logger("Start Conversation for '".$search."'", LOGGER_DEBUG); - $o .= conversation($a,$r,'search',false); + $o .= conversation($a, $r, 'search', false, false, 'commented', local_user()); $o .= alt_pager($a,count($r)); @@ -243,4 +261,3 @@ function search_content(App $a) { return $o; } -