X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=7c78339c70b1638c271f90dcef86caccfbc0bd3b;hb=36769d77eba0bc90cff6942ba55b00047cb25a2b;hp=b9bad6405928097c2ce328ea693f08a0cd025826;hpb=5837fd4f817c06a723af9ad27298b6bef40e37e5;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
index b9bad64059..7c78339c70 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,4 +1,8 @@
 <?php
+require_once("include/bbcode.php");
+require_once('include/security.php');
+require_once('include/conversation.php');
+require_once('mod/dirfind.php');
 
 function search_saved_searches() {
 
@@ -7,7 +11,7 @@ function search_saved_searches() {
 	if(! feature_enabled(local_user(),'savedsearch'))
 		return $o;
 
-	$r = q("select `id`,`term` from `search` WHERE `uid` = %d",
+	$r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
 		intval(local_user())
 	);
 
@@ -15,11 +19,11 @@ function search_saved_searches() {
 		$saved = array();
 		foreach($r as $rr) {
 			$saved[] = array(
-				'id'            => $rr['id'],
-				'term'			=> $rr['term'],
-				'encodedterm' 	=> urlencode($rr['term']),
-				'delete'		=> t('Remove term'),
-				'selected'		=> ($search==$rr['term']),
+				'id'		=> $rr['id'],
+				'term'		=> $rr['term'],
+				'encodedterm'	=> urlencode($rr['term']),
+				'delete'	=> t('Remove term'),
+				'selected'	=> ($search==$rr['term']),
 			);
 		}
 
@@ -27,10 +31,10 @@ function search_saved_searches() {
 		$tpl = get_markup_template("saved_searches_aside.tpl");
 
 		$o .= replace_macros($tpl, array(
-			'$title'	 => t('Saved Searches'),
-			'$add'		 => '',
-			'$searchbox' => '',
-			'$saved' 	 => $saved,
+			'$title'	=> t('Saved Searches'),
+			'$add'		=> '',
+			'$searchbox'	=> '',
+			'$saved' 	=> $saved,
 		));
 	}
 
@@ -45,12 +49,12 @@ function search_init(&$a) {
 
 	if(local_user()) {
 		if(x($_GET,'save') && $search) {
-			$r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1",
+			$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') ",
+				q("INSERT INTO `search` (`uid`,`term`) VALUES ( %d, '%s')",
 					intval(local_user()),
 					dbesc($search)
 				);
@@ -90,11 +94,44 @@ function search_content(&$a) {
 		return;
 	}
 
+	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.")));
+		killme();
+		//notice(t('Public access denied.').EOL);
+		//return;
+	}
+
+	if (get_config('system','permit_crawling') AND !local_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'));
+		if ($free_crawls == 0)
+			$free_crawls = 10;
+
+		$crawl_permit_period = intval(get_config('system','crawl_permit_period'));
+		if ($crawl_permit_period == 0)
+			$crawl_permit_period = 10;
+
+		$remote = $_SERVER["REMOTE_ADDR"];
+		$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)) {
+				http_status_exit(429,
+						array("title" => t("Too Many Requests"),
+							"description" => 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);
+		} else
+			Cache::set("remote_search:".$remote, json_encode(array("time" => time(), "accesses" => 1)), CACHE_HOUR);
+	}
+
 	nav_set_selected('search');
 
-	require_once("include/bbcode.php");
-	require_once('include/security.php');
-	require_once('include/conversation.php');
 
 	$o = '<h3>' . t('Search') . '</h3>';
 
@@ -110,17 +147,34 @@ function search_content(&$a) {
 	}
 
 
-	$o .= search($search,'search-box','/search',((local_user()) ? true : false));
+	$o .= search($search,'search-box','/search',((local_user()) ? true : false), false);
 
 	if(strpos($search,'#') === 0) {
 		$tag = true;
 		$search = substr($search,1);
 	}
 	if(strpos($search,'@') === 0) {
-		require_once('mod/dirfind.php');
+		return dirfind_content($a);
+	}
+	if(strpos($search,'!') === 0) {
 		return dirfind_content($a);
 	}
 
+        if(x($_GET,'search-option'))
+		switch($_GET['search-option']) {
+			case 'fulltext':
+				break;
+			case 'tags':
+				$tag = true;
+				break;
+			case 'contacts':
+				return dirfind_content($a, "@");
+				break;
+			case 'forums':
+				return dirfind_content($a, "!");
+				break;
+		}
+
 	if(! $search)
 		return $o;
 
@@ -135,7 +189,7 @@ function search_content(&$a) {
 	if($tag) {
 		logger("Start tag search for '".$search."'", LOGGER_DEBUG);
 
-		$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
+		$r = q("SELECT STRAIGHT_JOIN `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
 				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
 				`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
 				`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@@ -156,7 +210,7 @@ function search_content(&$a) {
 			$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
 		}
 
-		$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
+		$r = q("SELECT STRAIGHT_JOIN `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
 				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
 				`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
 				`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@@ -177,9 +231,13 @@ function search_content(&$a) {
 
 
 	if($tag)
-		$o .= '<h2>Items tagged with: ' . $search . '</h2>';
+		$title = sprintf( t('Items tagged with: %s'), $search);
 	else
-		$o .= '<h2>Search results for: ' . $search . '</h2>';
+		$title = sprintf( t('Search results for: %s'), $search);
+
+	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
+		'$title' => $title
+	));
 
 	logger("Start Conversation for '".$search."'", LOGGER_DEBUG);
 	$o .= conversation($a,$r,'search',false);