X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fsearch.php;h=984167fd78dc8367342519076c89c3f1f987dfc2;hb=de4a2e6fd03cd0aab94a256eba92ed593931534b;hp=99ec6c5f7d2ec6336465e940d37435c0870818ff;hpb=e2f8673076165c402782332b42ee744b1ffc7969;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
index 99ec6c5f7d..984167fd78 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,4 +1,10 @@
 <?php
+
+use Friendica\App;
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+
 require_once("include/bbcode.php");
 require_once('include/security.php');
 require_once('include/conversation.php');
@@ -8,16 +14,16 @@ 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",
 		intval(local_user())
 	);
 
-	if(count($r)) {
+	if (DBM::is_result($r)) {
 		$saved = array();
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$saved[] = array(
 				'id'		=> $rr['id'],
 				'term'		=> $rr['term'],
@@ -43,34 +49,27 @@ function search_saved_searches() {
 }
 
 
-function search_init(&$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)
 			);
-			if(! count($r)) {
-				q("INSERT INTO `search` (`uid`,`term`) VALUES ( %d, '%s')",
-					intval(local_user()),
-					dbesc($search)
-				);
+			if (!DBM::is_result($r)) {
+				dba::insert('search', array('uid' => local_user(), 'term' => $search));
 			}
 		}
-		if(x($_GET,'remove') && $search) {
-			q("DELETE FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
-				intval(local_user()),
-				dbesc($search)
-			);
+		if (x($_GET,'remove') && $search) {
+			dba::delete('search', array('uid' => local_user(), 'term' => $search));
 		}
 
 		$a->page['aside'] .= search_saved_searches();
 
-	}
-	else {
+	} else {
 		unset($_SESSION['theme']);
 		unset($_SESSION['mobile-theme']);
 	}
@@ -81,20 +80,20 @@ function search_init(&$a) {
 
 
 
-function search_post(&$a) {
-	if(x($_POST,'search'))
+function search_post(App $a) {
+	if (x($_POST,'search'))
 		$a->data['search'] = $_POST['search'];
 }
 
 
-function search_content(&$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(t('Public access denied.') . EOL);
 		return;
 	}
 
-	if(get_config('system','local_search') AND !local_user()) {
+	if (Config::get('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.")));
@@ -103,15 +102,15 @@ function search_content(&$a) {
 		//return;
 	}
 
-	if (get_config('system','permit_crawling') AND !local_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;
 
@@ -119,7 +118,7 @@ function search_content(&$a) {
 		$result = Cache::get("remote_search:".$remote);
 		if (!is_null($result)) {
 			$resultdata = json_decode($result);
-			if (($resultdata->time > (time() - $crawl_permit_period)) AND ($resultdata->accesses > $free_crawls)) {
+			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.")));
@@ -132,13 +131,13 @@ function search_content(&$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 +150,18 @@ function search_content(&$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,10 +176,10 @@ function search_content(&$a) {
 				break;
 		}
 
-	if(! $search)
+	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...
@@ -188,48 +187,40 @@ function search_content(&$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 STRAIGHT_JOIN %s, %s
+		$r = q("SELECT %s
 			FROM `term`
-				INNER JOIN `item` ON `item`.`id`=`term`.`oid`
-				INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
+				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'
 			ORDER BY term.created DESC LIMIT %d , %d ",
-				item_fieldlist(), contact_fieldlist(),
-				contact_condition(), item_condition(),
+				item_fieldlists(), item_joins(), item_condition(),
 				intval(local_user()),
 				intval(TERM_OBJ_POST), intval(TERM_HASHTAG), dbesc(protect_sprintf($search)),
 				intval($a->pager['start']), intval($a->pager['itemspage']));
 	} 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 {
-			$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
-		}
+		$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
 
-		$r = q("SELECT STRAIGHT_JOIN %s, %s
-			FROM `item`
-				INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
+		$r = q("SELECT %s
+			FROM `item` %s
 			WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`))
 				$sql_extra
-			GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d",
-				item_fieldlist(), contact_fieldlist(),
-				contact_condition(), item_condition(),
+			GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d",
+				item_fieldlists(), item_joins(), item_condition(),
 				intval(local_user()),
 				intval($a->pager['start']), intval($a->pager['itemspage']));
 	}
 
-	if(! count($r)) {
+	if (! DBM::is_result($r)) {
 		info( t('No results.') . EOL);
 		return $o;
 	}
 
 
-	if($tag)
+	if ($tag)
 		$title = sprintf( t('Items tagged with: %s'), $search);
 	else
 		$title = sprintf( t('Results for: %s'), $search);