X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=00f379a75c19ac6aa995cf9d66090c8d640e4679;hb=735e6bbcb47e973ad6aa0ec17d1812687c8fae32;hp=466ffc4c34cad18c6fdf62c3deaa495a81836321;hpb=b1dacd6d838ecf75fe828279e57c2e7a866be22f;p=friendica.git
diff --git a/mod/search.php b/mod/search.php
index 466ffc4c34..00f379a75c 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -4,19 +4,35 @@ function search_saved_searches() {
$o = '';
+ 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 .= '
' . "\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;
@@ -50,8 +66,10 @@ function search_init(&$a) {
$a->page['aside'] .= search_saved_searches();
}
- else
+ else {
unset($_SESSION['theme']);
+ unset($_SESSION['mobile-theme']);
+ }
@@ -78,9 +96,7 @@ function search_content(&$a) {
require_once('include/security.php');
require_once('include/conversation.php');
- $o = '' . "\r\n";
-
- $o .= '' . t('Search') . '
';
+ $o = '' . t('Search') . '
';
if(x($a->data,'search'))
$search = notags(trim($a->data['search']));
@@ -108,71 +124,93 @@ function search_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 (get_config('system','only_tag_search'))
+ $tag = true;
+ if($tag) {
+ $sql_extra = "";
+ $sql_table = sprintf("`item` INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d) AS `term` ON `item`.`id` = `term`.`oid` ",
+ dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG));
+ $sql_order = "`item`.`id`";
+ } else {
+ 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_table = "`item`";
+ $sql_order = "`item`.`id`";
+ //$sql_order = "`item`.`received`";
+ }
// 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 `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( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
+ $r = q("SELECT distinct(`item`.`uri`) as `total`
+ FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ INNER 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 ))
+ $sql_extra ",
+ intval(local_user())
+ );
+// $sql_extra group by `item`.`uri` ",
+
+ if(count($r))
+ $a->set_pager_total(count($r));
+
+ if(! count($r)) {
+ info( t('No results.') . EOL);
+ return $o;
+ }
}
- $r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
- `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+ $r = q("SELECT `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`
+ `user`.`nickname`, `user`.`uid`, `user`.`hidewall`
+ FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ INNER 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 ",
+ OR ( `item`.`uid` = %d ))
+ $sql_extra GROUP BY `item`.`uri`
+ ORDER BY $sql_order DESC LIMIT %d , %d ",
intval(local_user()),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
+// group by `item`.`uri`
- if($tag)
+ if(! count($r)) {
+ info( t('No results.') . EOL);
+ return $o;
+ }
+
+
+ if($tag)
$o .= 'Items tagged with: ' . $search . '
';
else
$o .= 'Search results for: ' . $search . '
';
$o .= conversation($a,$r,'search',false);
- $o .= paginate($a);
+ if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
+ $o .= alt_pager($a,count($r));
+ }
+ else {
+ $o .= paginate($a);
+ }
return $o;
}