X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommunity.php;h=1f8adf89072ba1fd17d538279f3416967734ee66;hb=7ab366b9c3653160dbe68fe2d096e4174547ff84;hp=354f68528dab479e8e1565ec08b75d64fbf20841;hpb=7aa10d1935e0a61fa9199710ff86431ab24b05e1;p=friendica.git diff --git a/mod/community.php b/mod/community.php index 354f68528d..1f8adf8907 100644 --- a/mod/community.php +++ b/mod/community.php @@ -1,8 +1,10 @@ ' . t('Community') . ''; if(! $update) { nav_set_selected('community'); - $o .= '
' . "\r\n"; - $o .= "\r\n"; } if(x($a->data,'search')) @@ -44,43 +44,48 @@ function community_content(&$a, $update = 0) { // Only public posts can be shown // OR your own posts if you are a logged in member - if(! get_pconfig(local_user(),'system','alt_pager')) { - $r = q("SELECT COUNT(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 `item`.`wall` = 1 AND `user`.`hidewall` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0" - ); + if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) { + $r = q("SELECT COUNT(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 `item`.`wall` = 1 AND `user`.`hidewall` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0" + ); - if(count($r)) - $a->set_pager_total($r[0]['total']); + if(count($r)) + $a->set_pager_total($r[0]['total']); - if(! $r[0]['total']) { - info( t('No results.') . EOL); - return $o; - } + if(! $r[0]['total']) { + info( t('No results.') . EOL); + return $o; + } } - $r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, + //$r = q("SELECT distinct(`item`.`uri`) + $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`, `user`.`hidewall` - FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` + FROM `item` FORCE INDEX (`received`) 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 `item`.`wall` = 1 AND `user`.`hidewall` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 group by `item`.`uri` + AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`id` = `item`.`parent` + AND `user`.`hidewall` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` ORDER BY `received` DESC LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']) ); +// group by `item`.`uri` +// AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`id` = `item`.`parent` +// AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` if(! count($r)) { info( t('No results.') . EOL); @@ -91,11 +96,11 @@ function community_content(&$a, $update = 0) { $o .= conversation($a,$r,'community',$update); - if(! get_pconfig(local_user(),'system','alt_pager')) { - $o .= paginate($a); + if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) { + $o .= alt_pager($a,count($r)); } else { - $o .= alt_pager($a,count($r)); + $o .= paginate($a); } return $o;