Fix the version sorting in the federation statistics

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index 57b65df1c4bcc011e8c9b9fe9336065f06061b8c..be0f943d07c4a7e830089213a26588e308eacaed 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -8,9 +8,9 @@ use Friendica\Content\Nav;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\System;
 use Friendica\Database\DBM;
 
-require_once "include/bbcode.php";
 require_once 'include/security.php';
 require_once 'include/conversation.php';
 require_once 'mod/dirfind.php';
@@ -18,6 +18,7 @@ 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'))
                return $o;
@@ -99,7 +100,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 +125,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 +146,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,
@@ -199,11 +200,13 @@ function search_content(App $a) {
                $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'
+                       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' AND `item`.`verb` = '%s'
+                               AND NOT `author`.`blocked` AND NOT `author`.`hidden`
                        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(TERM_OBJ_POST), intval(TERM_HASHTAG), dbesc(protect_sprintf($search)), dbesc(ACTIVITY_POST),
                                intval($a->pager['start']), intval($a->pager['itemspage']));
        } else {
                logger("Start fulltext search for '".$search."'", LOGGER_DEBUG);
@@ -213,6 +216,7 @@ function search_content(App $a) {
                $r = q("SELECT %s
                        FROM `item` %s
                        WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`))
+                               AND NOT `author`.`blocked` AND NOT `author`.`hidden`
                                $sql_extra
                        GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d",
                                item_fieldlists(), item_joins(), item_condition(),
@@ -226,10 +230,11 @@ function search_content(App $a) {
        }
 
 
-       if ($tag)
-               $title = sprintf(L10n::t('Items tagged with: %s'), $search);
-       else
-               $title = sprintf(L10n::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"),[
                '$title' => $title