X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=b40fe07157f233f3b3825a0ed3675e3e2c51e9f0;hb=5a3991d4f7bc929c1087d9275716fc1c8cc299a6;hp=37dacadddf1131c8810a4af4236c1cbc7b2403d6;hpb=7d5494dd67f58e1fc63c6571946e26290092321c;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
index 37dacadddf..b40fe07157 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
+use Friendica\Content\Text\HTML;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -15,6 +16,7 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
+use Friendica\Util\Strings;
 
 require_once 'include/conversation.php';
 require_once 'mod/dirfind.php';
@@ -22,10 +24,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;
+	$search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
 
 	$r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
 		intval(local_user())
@@ -61,10 +60,10 @@ function search_saved_searches() {
 
 function search_init(App $a) {
 
-	$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+	$search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
 
 	if (local_user()) {
-		if (x($_GET,'save') && $search) {
+		if (!empty($_GET['save']) && $search) {
 			$r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
 				intval(local_user()),
 				DBA::escape($search)
@@ -73,7 +72,7 @@ function search_init(App $a) {
 				DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
 			}
 		}
-		if (x($_GET,'remove') && $search) {
+		if (!empty($_GET['remove']) && $search) {
 			DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
 		}
 
@@ -93,14 +92,6 @@ function search_init(App $a) {
 
 }
 
-
-
-function search_post(App $a) {
-	if (x($_POST,'search'))
-		$a->data['search'] = $_POST['search'];
-}
-
-
 function search_content(App $a) {
 
 	if (Config::get('system','block_public') && !local_user() && !remote_user()) {
@@ -146,16 +137,12 @@ function search_content(App $a) {
 
 	Nav::setSelected('search');
 
-	$search = '';
-	if (x($a->data,'search'))
-		$search = notags(trim($a->data['search']));
-	else
-		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+	$search = (!empty($_REQUEST['search']) ? Strings::escapeTags(trim(rawurldecode($_REQUEST['search']))) : '');
 
 	$tag = false;
-	if (x($_GET,'tag')) {
+	if (!empty($_GET['tag'])) {
 		$tag = true;
-		$search = (x($_GET,'tag') ? '#' . notags(trim(rawurldecode($_GET['tag']))) : '');
+		$search = (!empty($_GET['tag']) ? '#' . Strings::escapeTags(trim(rawurldecode($_GET['tag']))) : '');
 	}
 
 	// contruct a wrapper for the search header
@@ -163,7 +150,7 @@ function search_content(App $a) {
 		'name' => "search-header",
 		'$title' => L10n::t("Search"),
 		'$title_size' => 3,
-		'$content' => search($search,'search-box','search',((local_user()) ? true : false), false)
+		'$content' => HTML::search($search,'search-box','search', false)
 	]);
 
 	if (strpos($search,'#') === 0) {
@@ -177,7 +164,7 @@ function search_content(App $a) {
 		return dirfind_content($a);
 	}
 
-	if (x($_GET,'search-option'))
+	if (!empty($_GET['search-option']))
 		switch($_GET['search-option']) {
 			case 'fulltext':
 				break;