X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=d0738575367f3146909bb5e7bf56761ee658fae9;hb=1e3b4432454f5b12fb67e35c3bb7cd193af48c8f;hp=3a253762689693dfcdc2aea6876bf2fffa08beb6;hpb=a020086128e3d903a030cc3b3d403ab9bce02d88;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
index 3a25376268..d073857536 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -8,7 +8,7 @@ function search_saved_searches() {
 
 	$o = '';
 
-	if(! feature_enabled(local_user(),'savedsearch'))
+	if (! feature_enabled(local_user(),'savedsearch'))
 		return $o;
 
 	$r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
@@ -17,7 +17,7 @@ function search_saved_searches() {
 
 	if (dbm::is_result($r)) {
 		$saved = array();
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$saved[] = array(
 				'id'		=> $rr['id'],
 				'term'		=> $rr['term'],
@@ -43,12 +43,12 @@ function search_saved_searches() {
 }
 
 
-function search_init(App &$a) {
+function search_init(App $a) {
 
 	$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-	if(local_user()) {
-		if(x($_GET,'save') && $search) {
+	if (local_user()) {
+		if (x($_GET,'save') && $search) {
 			$r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
 				intval(local_user()),
 				dbesc($search)
@@ -60,7 +60,7 @@ function search_init(App &$a) {
 				);
 			}
 		}
-		if(x($_GET,'remove') && $search) {
+		if (x($_GET,'remove') && $search) {
 			q("DELETE FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
 				intval(local_user()),
 				dbesc($search)
@@ -81,20 +81,20 @@ function search_init(App &$a) {
 
 
 
-function search_post(App &$a) {
-	if(x($_POST,'search'))
+function search_post(App $a) {
+	if (x($_POST,'search'))
 		$a->data['search'] = $_POST['search'];
 }
 
 
-function search_content(App &$a) {
+function search_content(App $a) {
 
-	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+	if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
 
-	if(get_config('system','local_search') AND !local_user()) {
+	if (get_config('system','local_search') AND !local_user()) {
 		http_status_exit(403,
 				array("title" => t("Public access denied."),
 					"description" => t("Only logged in users are permitted to perform a search.")));
@@ -132,13 +132,13 @@ function search_content(App &$a) {
 
 	nav_set_selected('search');
 
-	if(x($a->data,'search'))
+	if (x($a->data,'search'))
 		$search = notags(trim($a->data['search']));
 	else
 		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
 	$tag = false;
-	if(x($_GET,'tag')) {
+	if (x($_GET,'tag')) {
 		$tag = true;
 		$search = ((x($_GET,'tag')) ? notags(trim(rawurldecode($_GET['tag']))) : '');
 	}
@@ -151,18 +151,18 @@ function search_content(App &$a) {
 		'$content' => search($search,'search-box','search',((local_user()) ? true : false), false)
 	));
 
-	if(strpos($search,'#') === 0) {
+	if (strpos($search,'#') === 0) {
 		$tag = true;
 		$search = substr($search,1);
 	}
-	if(strpos($search,'@') === 0) {
+	if (strpos($search,'@') === 0) {
 		return dirfind_content($a);
 	}
-	if(strpos($search,'!') === 0) {
+	if (strpos($search,'!') === 0) {
 		return dirfind_content($a);
 	}
 
-	if(x($_GET,'search-option'))
+	if (x($_GET,'search-option'))
 		switch($_GET['search-option']) {
 			case 'fulltext':
 				break;
@@ -177,7 +177,7 @@ function search_content(App &$a) {
 				break;
 		}
 
-	if(! $search)
+	if (! $search)
 		return $o;
 
 	if (get_config('system','only_tag_search'))
@@ -188,7 +188,7 @@ function search_content(App &$a) {
 	// OR your own posts if you are a logged in member
 	// No items will be shown if the member has a blocked profile wall.
 
-	if($tag) {
+	if ($tag) {
 		logger("Start tag search for '".$search."'", LOGGER_DEBUG);
 
 		$r = q("SELECT %s
@@ -203,11 +203,12 @@ function search_content(App &$a) {
 	} else {
 		logger("Start fulltext search for '".$search."'", LOGGER_DEBUG);
 
-		if (get_config('system','use_fulltext_engine')) {
-			$sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));
-		} else {
+		// Disabled until finally is decided how to proceed with this
+		//if (get_config('system','use_fulltext_engine')) {
+		//	$sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));
+		//} else {
 			$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
-		}
+		//}
 
 		$r = q("SELECT %s
 			FROM `item` %s
@@ -225,7 +226,7 @@ function search_content(App &$a) {
 	}
 
 
-	if($tag)
+	if ($tag)
 		$title = sprintf( t('Items tagged with: %s'), $search);
 	else
 		$title = sprintf( t('Results for: %s'), $search);