X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fsearch.php;h=956816fed0ec7dc5212f4274454e5cc4a29b1e41;hb=79fb5509ed623d2f2f648d26afa5cae2ab092444;hp=466ffc4c34cad18c6fdf62c3deaa495a81836321;hpb=b1dacd6d838ecf75fe828279e57c2e7a866be22f;p=friendica.git
diff --git a/mod/search.php b/mod/search.php
index 466ffc4c34..956816fed0 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -4,18 +4,34 @@ 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']));
@@ -128,25 +144,28 @@ function search_content(&$a) {
// 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;
+ if( (! get_config('alt_pager', 'global')) && (! 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;
+ }
}
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
- `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+ `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`
@@ -165,6 +184,12 @@ function search_content(&$a) {
);
+ if(! count($r)) {
+ info( t('No results.') . EOL);
+ return $o;
+ }
+
+
if($tag)
$o .= 'Items tagged with: ' . $search . '
';
else
@@ -172,7 +197,12 @@ function search_content(&$a) {
$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;
}