friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #539 from fermionic/20121127-universal-altpager

Browse source 
universal altpager
This commit is contained in:
fermionic 2012-11-28 16:40:26 -08:00
parent a6e7ad9771 eb964bbe08
commit eb37c8cca6
4 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
mod/community.php
View file

@ -44,23 +44,23 @@ function community_content(&$a, $update = 0) {
// Only public posts can be shown // Only public posts can be shown
// OR your own posts if you are a logged in member // OR your own posts if you are a logged in member
if(! get_pconfig(local_user(),'system','alt_pager')) { if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
$r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total` $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` 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 WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0" AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0"
); );
if(count($r)) if(count($r))
$a->set_pager_total($r[0]['total']); $a->set_pager_total($r[0]['total']);
if(! $r[0]['total']) { if(! $r[0]['total']) {
info( t('No results.') . EOL); info( t('No results.') . EOL);
return $o; return $o;
} }
} }
@ -91,11 +91,11 @@ function community_content(&$a, $update = 0) {
$o .= conversation($a,$r,'community',$update); $o .= conversation($a,$r,'community',$update);
if(! get_pconfig(local_user(),'system','alt_pager')) { if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
$o .= paginate($a); $o .= alt_pager($a,count($r));
} }
else { else {
$o .= alt_pager($a,count($r)); $o .= paginate($a);
} }
return $o; return $o;

8
mod/network.php
View file

@ -696,7 +696,7 @@ function network_content(&$a, $update = 0) {
} }
else { else {
if(! get_pconfig(local_user(),'system','alt_pager')) { if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
$r = q("SELECT COUNT(*) AS `total` $r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@ -845,11 +845,11 @@ function network_content(&$a, $update = 0) {
$o .= conversation($a,$items,$mode,$update); $o .= conversation($a,$items,$mode,$update);
if(! $update) { if(! $update) {
if(! get_pconfig(local_user(),'system','alt_pager')) { if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
$o .= paginate($a); $o .= alt_pager($a,count($items));
} }
else { else {
$o .= alt_pager($a,count($items)); $o .= paginate($a);
} }
} }

14
mod/profile.php
View file

@ -242,7 +242,7 @@ function profile_content(&$a, $update = 0) {
$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
} }
if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) { if( (! get_config('alt_pager', 'global')) && (! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) ) {
$r = q("SELECT COUNT(*) AS `total` $r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@ -323,12 +323,12 @@ function profile_content(&$a, $update = 0) {
$o .= conversation($a,$items,'profile',$update); $o .= conversation($a,$items,'profile',$update);
if(! $update) { if(! $update) {
if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) { if( get_config('alt_pager', 'global') || get_pconfig($a->profile['profile_uid'],'system','alt_pager') ) {
$o .= paginate($a); $o .= alt_pager($a,count($items));
} }
else { else {
$o .= alt_pager($a,count($items)); $o .= paginate($a);
} }
} }
return $o; return $o;

8
mod/search.php
View file

@ -144,7 +144,7 @@ function search_content(&$a) {
// OR your own posts if you are a logged in member // OR your own posts if you are a logged in member
// No items will be shown if the member has a blocked profile wall. // No items will be shown if the member has a blocked profile wall.
if(! get_pconfig(local_user(),'system','alt_pager')) { if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
$r = q("SELECT distinct(`item`.`uri`) 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` 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 WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
@ -197,11 +197,11 @@ function search_content(&$a) {
$o .= conversation($a,$r,'search',false); $o .= conversation($a,$r,'search',false);
if(! get_pconfig(local_user(),'system','alt_pager')) { if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
$o .= paginate($a); $o .= alt_pager($a,count($r));
} }
else { else {
$o .= alt_pager($a,count($r)); $o .= paginate($a);
} }
return $o; return $o;