Rename App->path to App->urlpath

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index b48fafe7854ae295d92478f94a8fa754bbcbbf14..8f89e72001078905eab52d6cf59a73eb10af8614 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -8,9 +8,10 @@ use Friendica\Content\Nav;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 
-require_once "include/bbcode.php";
 require_once 'include/security.php';
 require_once 'include/conversation.php';
 require_once 'mod/dirfind.php';
@@ -18,8 +19,9 @@ require_once 'mod/dirfind.php';
 function search_saved_searches() {
 
        $o = '';
+       $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-       if (! Feature::isEnabled(local_user(),'savedsearch'))
+       if (!Feature::isEnabled(local_user(),'savedsearch'))
                return $o;
 
        $r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
@@ -72,6 +74,11 @@ function search_init(App $a) {
                        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 {
@@ -99,7 +106,7 @@ function search_content(App $a) {
        }
 
        if (Config::get('system','local_search') && !local_user() && !remote_user()) {
-               http_status_exit(403,
+               System::httpExit(403,
                                ["title" => L10n::t("Public access denied."),
                                        "description" => L10n::t("Only logged in users are permitted to perform a search.")]);
                killme();
@@ -124,7 +131,7 @@ function search_content(App $a) {
                if (!is_null($result)) {
                        $resultdata = json_decode($result);
                        if (($resultdata->time > (time() - $crawl_permit_period)) && ($resultdata->accesses > $free_crawls)) {
-                               http_status_exit(429,
+                               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();
@@ -145,11 +152,11 @@ function search_content(App $a) {
        $tag = false;
        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"),[
+       $o = replace_macros(get_markup_template("content_wrapper.tpl"),[
                'name' => "search-header",
                '$title' => L10n::t("Search"),
                '$title_size' => 3,
@@ -182,7 +189,7 @@ function search_content(App $a) {
                                break;
                }
 
-       if (! $search)
+       if (!$search)
                return $o;
 
        if (Config::get('system','only_tag_search'))
@@ -196,31 +203,39 @@ function search_content(App $a) {
        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']));
+               $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 (!empty($itemids)) {
+                       $params = ['order' => ['id' => true]];
+                       $items = Item::selectForUser(local_user(), [], ['id' => $itemids], $params);
+                       $r = Item::inArray($items);
+               } else {
+                       $r = [];
+               }
        } else {
                logger("Start fulltext search for '".$search."'", LOGGER_DEBUG);
 
-               $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
-
-               $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`, `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']));
+               $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)) {
+       if (!DBM::is_result($r)) {
                info(L10n::t('No results.') . EOL);
                return $o;
        }
@@ -237,7 +252,7 @@ function search_content(App $a) {
        ]);
 
        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));
 
@@ -245,4 +260,3 @@ function search_content(App $a) {
 
        return $o;
 }
-