From: Michael Vogel <icarus@dabo.de>
Date: Sat, 26 May 2012 09:51:48 +0000 (+0200)
Subject: Saved searches now can search for tags as well
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a5dc41ab131d4235eb947ff00d7af0593bf0e460;p=friendica.git

Saved searches now can search for tags as well
---

diff --git a/mod/network.php b/mod/network.php
index f54d055d38..6b4fa9a5b3 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -402,10 +402,22 @@ function network_content(&$a, $update = 0) {
 
 	if(x($_GET,'search')) {
 		$search = escape_tags($_GET['search']);
-		$sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
-			dbesc(protect_sprintf('%' . $search . '%')),
-			dbesc(protect_sprintf('%]' . $search . '[%'))
-		);
+		if (get_config('system','use_fulltext_engine')) {
+			if(strpos($search,'#') === 0)
+				$sql_extra .= sprintf(" AND (MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
+					dbesc(protect_sprintf($search))
+				);
+			else
+				$sql_extra .= sprintf(" AND (MATCH(`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
+					dbesc(protect_sprintf($search)),
+					dbesc(protect_sprintf($search))
+				);
+		} else {
+			$sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
+					dbesc(protect_sprintf('%' . $search . '%')),
+					dbesc(protect_sprintf('%]' . $search . '[%'))
+			);
+		}
 	}
 	if(strlen($file)) {
 		$sql_extra .= file_tag_file_query('item',unxmlify($file));
diff --git a/mod/search.php b/mod/search.php
index ac51346963..d4cd9d9676 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -71,7 +71,7 @@ function search_content(&$a) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
-	
+
 	nav_set_selected('search');
 
 	require_once("include/bbcode.php");
@@ -96,7 +96,6 @@ function search_content(&$a) {
 
 	$o .= search($search,'search-box','/search',((local_user()) ? true : false));
 
-
 	if(strpos($search,'#') === 0) {
 		$tag = true;
 		$search = substr($search,1);