X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=320ffddcef2fbc0df671e6c58e5c26937372711a;hb=15cae001d947d27a75147aecec089e44d7b8c31f;hp=d150b2e1e42488b7910cdff737a06d5cc9265a31;hpb=6a9e22550d82595c4341290ca26e3afc5fe6300f;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
index d150b2e1e4..320ffddcef 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -4,17 +4,18 @@ function search_saved_searches() {
 
 	$o = '';
 
-	$r = q("select `term` from `search` WHERE `uid` = %d",
+	$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 .= '<div id="saved-search-list"><ul id="saved-search-ul">' . "\r\n";
+		$o .= '<ul id="saved-search-ul">' . "\r\n";
 		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";
+			$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";
 		}
-		$o .= '</ul></div>' . "\r\n";
+		$o .= '</ul><div class="clear"></div></div>' . "\r\n";
 	}		
 
 	return $o;
@@ -49,6 +50,9 @@ function search_init(&$a) {
 		$a->page['aside'] .= search_saved_searches();
 
 	}
+	else
+		unset($_SESSION['theme']);
+
 
 
 }
@@ -68,13 +72,12 @@ function search_content(&$a) {
 		return;
 	}
 
+	nav_set_selected('search');
+
 	require_once("include/bbcode.php");
 	require_once('include/security.php');
 	require_once('include/conversation.php');
 
-	if(x($_SESSION,'theme'))
-		unset($_SESSION['theme']);
-
 	$o = '<div id="live-search"></div>' . "\r\n";
 
 	$o .= '<h3>' . t('Search') . '</h3>';
@@ -84,63 +87,88 @@ function search_content(&$a) {
 	else
 		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
+	$tag = false;
+	if(x($_GET,'tag')) {
+		$tag = true;
+		$search = ((x($_GET,'tag')) ? notags(trim(rawurldecode($_GET['tag']))) : '');
+	}
+
+
 	$o .= search($search,'search-box','/search',((local_user()) ? true : 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;
 
-	// Here is the way permissions work in the search module...
-	// Only public wall posts can be shown
-	// OR your own posts if you are a logged in member
+	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))));
+	}
 
-	$s_bool  = "AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )";
-	$s_regx  = "AND `item`.`body` REGEXP '%s' ";
 
-	if(mb_strlen($search) >= 3)
-		$search_alg = $s_bool;
-	else
-		$search_alg = $s_regx;
 
-	$r = q("SELECT COUNT(*) AS `total`
+
+	// 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. 
+
+	$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 (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0) 
+		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
-		$search_alg ",
-		intval(local_user()),
-		dbesc($search)
+		$sql_extra group by `item`.`uri` ", 
+		intval(local_user())
 	);
 
 	if(count($r))
-		$a->set_pager_total($r[0]['total']);
-
-	if(! $r[0]['total']) {
+		$a->set_pager_total(count($r));
+	if(! count($r)) {
 		info( t('No results.') . EOL);
 		return $o;
 	}
 
-	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+	$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 (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0 ) 
+		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
-		$search_alg
+		$sql_extra
+		group by `item`.`uri`	
 		ORDER BY `received` DESC LIMIT %d , %d ",
 		intval(local_user()),
-		dbesc($search),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 
 	);
 
-
+	if($tag) 
+		$o .= '<h2>Items tagged with: ' . $search . '</h2>';
+	else
+		$o .= '<h2>Search results for: ' . $search . '</h2>';
 
 	$o .= conversation($a,$r,'search',false);