X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=c15dfae3fea8d981cf74efe685f9fef59078413f;hb=7de6f23f4a169713b4385fa6fd2a8d397b47b759;hp=8f73b92448d7630e02fd1fc105612dcf7853fd92;hpb=717fd8539b10eb478d0f05bb4fd823167a43e581;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
index 8f73b92448..c15dfae3fe 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,22 +1,42 @@
 <?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() {
 
 	$o = '';
 
-	$r = q("select `id`,`term` from `search` WHERE `uid` = %d",
+	if(! feature_enabled(local_user(),'savedsearch'))
+		return $o;
+
+	$r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
 		intval(local_user())
 	);
 
 	if(count($r)) {
-		$o .= '<div id="saved-search-list" class="widget">';
-		$o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n";
-		$o .= '<ul id="saved-search-ul">' . "\r\n";
+		$saved = array();
 		foreach($r as $rr) {
-			$o .= '<li class="saved-search-li clear"><a href="search/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="search/?f=&search=' . $rr['term'] . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n";
+			$saved[] = array(
+				'id'		=> $rr['id'],
+				'term'		=> $rr['term'],
+				'encodedterm'	=> urlencode($rr['term']),
+				'delete'	=> t('Remove term'),
+				'selected'	=> ($search==$rr['term']),
+			);
 		}
-		$o .= '</ul><div class="clear"></div></div>' . "\r\n";
-	}		
+
+
+		$tpl = get_markup_template("saved_searches_aside.tpl");
+
+		$o .= replace_macros($tpl, array(
+			'$title'	=> t('Saved Searches'),
+			'$add'		=> '',
+			'$searchbox'	=> '',
+			'$saved' 	=> $saved,
+		));
+	}
 
 	return $o;
 
@@ -29,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)
 				);
@@ -50,8 +70,10 @@ function search_init(&$a) {
 		$a->page['aside'] .= search_saved_searches();
 
 	}
-	else
+	else {
 		unset($_SESSION['theme']);
+		unset($_SESSION['mobile-theme']);
+	}
 
 
 
@@ -72,15 +94,36 @@ function search_content(&$a) {
 		return;
 	}
 
-	nav_set_selected('search');
+	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()) {
+		// To-Do:
+		// - 10 requests are "free", after the 11th only a call per minute is allowed
+
+		$remote = $_SERVER["REMOTE_ADDR"];
+		$result = Cache::get("remote_search:".$remote);
+		if (!is_null($result)) {
+			if ($result > (time() - 60)) {
+				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, time(), CACHE_HOUR);
+	}
 
-	require_once("include/bbcode.php");
-	require_once('include/security.php');
-	require_once('include/conversation.php');
+	nav_set_selected('search');
 
-	$o = '<div id="live-search"></div>' . "\r\n";
 
-	$o .= '<h3>' . t('Search') . '</h3>';
+	$o = '<h3>' . t('Search') . '</h3>';
 
 	if(x($a->data,'search'))
 		$search = notags(trim($a->data['search']));
@@ -94,79 +137,82 @@ 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(! $search)
-		return $o;
-
-	if (get_config('system','use_fulltext_engine')) {
-		if($tag)
-			$sql_extra = sprintf(" AND MATCH (`item`.`tag`) AGAINST ('".'"%s"'."' in boolean mode) ", '#'.dbesc(protect_sprintf($search)));
-		else
-			$sql_extra = sprintf(" AND MATCH (`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) ", dbesc(protect_sprintf($search)));
-	} else {
-		if($tag)
-			$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", 	dbesc('\\]' . protect_sprintf(preg_quote($search)) . '\\['));
-		else
-			$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
+	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;
 
+	if (get_config('system','only_tag_search'))
+		$tag = true;
 
 	// Here is the way permissions work in the search module...
 	// Only public posts can be shown
 	// 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(! get_pconfig(local_user(),'system','alt_pager')) {
-	        $r = q("SELECT distinct(`item`.`uri`) as `total`
-		        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
-		        WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		        AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0) 
-			        OR `item`.`uid` = %d )
-		        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-		        $sql_extra group by `item`.`uri` ", 
-		        intval(local_user())
-	        );
-
-	        if(count($r))
-		        $a->set_pager_total(count($r));
-
-	        if(! count($r)) {
-		        info( t('No results.') . EOL);
-		        return $o;
-	        }
-	}
+	// No items will be shown if the member has a blocked profile wall.
+
+	if($tag) {
+		logger("Start tag search for '".$search."'", LOGGER_DEBUG);
+
+		$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`
+			FROM `term`
+				INNER JOIN `item` ON `item`.`id`=`term`.`oid`
+				INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+			WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
+				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 ",
+				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);
 
-	$r = q("SELECT distinct(`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`,
-		`user`.`nickname`
-		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-		LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
-		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) 
-			OR `item`.`uid` = %d )
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-		$sql_extra
-		group by `item`.`uri`	
-		ORDER BY `received` DESC LIMIT %d , %d ",
-		intval(local_user()),
-		intval($a->pager['start']),
-		intval($a->pager['itemspage'])
+		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 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`
+			FROM `item`
+				INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+			WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
+				AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND (`item`.`private` OR NOT `item`.`network` IN ('%s', '%s', '%s'))))
+				$sql_extra
+			GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d ",
+				intval(local_user()), dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA),
+				intval($a->pager['start']), intval($a->pager['itemspage']));
+	}
 
 	if(! count($r)) {
 		info( t('No results.') . EOL);
@@ -174,19 +220,21 @@ function search_content(&$a) {
 	}
 
 
-	if($tag) 
-		$o .= '<h2>Items tagged with: ' . $search . '</h2>';
+	if($tag)
+		$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);
 
-        if(! get_pconfig(local_user(),'system','alt_pager')) {
-	        $o .= paginate($a);
-	}
-	else {
-	        $o .= alt_pager($a,count($r));
-	}
+	$o .= alt_pager($a,count($r));
+
+	logger("Done '".$search."'", LOGGER_DEBUG);
 
 	return $o;
 }