X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=be0f943d07c4a7e830089213a26588e308eacaed;hb=e0b33b36a21d7803353692372d7ceb90683d8888;hp=1d28fe141ac6a15642176ee3f6f473579eae43c7;hpb=541d6ab8959fe3c069996e230def126c154da34d;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
index 1d28fe141a..be0f943d07 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,44 +1,53 @@
 <?php
-
+/**
+ * @file mod/search.php
+ */
 use Friendica\App;
-
-require_once("include/bbcode.php");
-require_once('include/security.php');
-require_once('include/conversation.php');
-require_once('mod/dirfind.php');
+use Friendica\Content\Feature;
+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/security.php';
+require_once 'include/conversation.php';
+require_once 'mod/dirfind.php';
 
 function search_saved_searches() {
 
 	$o = '';
+	$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-	if (! feature_enabled(local_user(),'savedsearch'))
+	if (! Feature::isEnabled(local_user(),'savedsearch'))
 		return $o;
 
 	$r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
 		intval(local_user())
 	);
 
-	if (dbm::is_result($r)) {
-		$saved = array();
+	if (DBM::is_result($r)) {
+		$saved = [];
 		foreach ($r as $rr) {
-			$saved[] = array(
+			$saved[] = [
 				'id'		=> $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;
@@ -56,12 +65,12 @@ function search_init(App $a) {
 				intval(local_user()),
 				dbesc($search)
 			);
-			if (!dbm::is_result($r)) {
-				dba::insert('search', array('uid' => local_user(), 'term' => $search));
+			if (!DBM::is_result($r)) {
+				dba::insert('search', ['uid' => local_user(), 'term' => $search]);
 			}
 		}
 		if (x($_GET,'remove') && $search) {
-			dba::delete('search', array('uid' => local_user(), 'term' => $search));
+			dba::delete('search', ['uid' => local_user(), 'term' => $search]);
 		}
 
 		$a->page['aside'] .= search_saved_searches();
@@ -85,29 +94,29 @@ function search_post(App $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(L10n::t('Public access denied.') . EOL);
 		return;
 	}
 
-	if (get_config('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.")));
+	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') && !local_user() && !remote_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;
 
@@ -116,18 +125,19 @@ 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,
-						array("title" => t("Too Many Requests"),
-							"description" => t("Only one search per minute is permitted for not logged in users.")));
+				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');
 
+	$search = '';
 	if (x($a->data,'search'))
 		$search = notags(trim($a->data['search']));
 	else
@@ -136,16 +146,16 @@ 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"),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) {
 		$tag = true;
@@ -176,7 +186,7 @@ function search_content(App $a) {
 	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...
@@ -190,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);
@@ -204,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(),
@@ -211,20 +224,21 @@ function search_content(App $a) {
 				intval($a->pager['start']), intval($a->pager['itemspage']));
 	}
 
-	if (! dbm::is_result($r)) {
-		info( t('No results.') . EOL);
+	if (! DBM::is_result($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);