X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=4ca7db9bb111c4e3000cdf8b672d4603a3d742e0;hb=4b762ff923626addc10e3b90c6fef183320c84ea;hp=034794e179db10d2137967a270fdf3778647ad28;hpb=24595c55d7258660862ef5bc2203b226d6615362;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
old mode 100644
new mode 100755
index 034794e179..4ca7db9bb1
--- a/mod/search.php
+++ b/mod/search.php
@@ -4,7 +4,7 @@ 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())
 	);
 
@@ -15,7 +15,7 @@ function search_saved_searches() {
 		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 .= '</ul></div>' . "\r\n";
+		$o .= '</ul><div class="clear"></div></div>' . "\r\n";
 	}		
 
 	return $o;
@@ -50,6 +50,9 @@ function search_init(&$a) {
 		$a->page['aside'] .= search_saved_searches();
 
 	}
+	else
+		unset($_SESSION['theme']);
+
 
 
 }
@@ -75,12 +78,9 @@ function search_content(&$a) {
 	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>';
+	$o .= '<h3>' . t('Search This Site') . '</h3>';
 
 	if(x($a->data,'search'))
 		$search = notags(trim($a->data['search']));
@@ -93,51 +93,46 @@ function search_content(&$a) {
 		return $o;
 
 	// Here is the way permissions work in the search module...
-	// Only public wall posts can be shown
+	// 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. 
 
-	$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`
+	$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 ",
+		AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) group by `item`.`uri` ", 
 		intval(local_user()),
-		dbesc($search)
+		dbesc(preg_quote($search)), 
+		dbesc('\\]' . preg_quote($search) . '\\[')
 	);
 
 	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`, 
+	$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `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
+		AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )
+		group by `item`.`uri`	
 		ORDER BY `received` DESC LIMIT %d , %d ",
 		intval(local_user()),
-		dbesc($search),
+		dbesc(preg_quote($search)), 
+		dbesc('\\]' . preg_quote($search) . '\\['),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])