add support for admin choice to force an entire hub to use alt-pager

diff --git a/mod/community.php b/mod/community.php
index defc873b0adaca306594fd2b14ab8d0903d7418e..aa5bb7268d2dc3d25472516bdbbd09bf6b5b14e2 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -44,23 +44,23 @@ 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(count($r))
-                       $a->set_pager_total($r[0]['total']);
-
-               if(! $r[0]['total']) {
-                       info( t('No results.') . EOL);
-                       return $o;
-               }
+       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(! $r[0]['total']) {
+                       info( t('No results.') . EOL);
+                       return $o;
+               }
 
        }
 
@@ -91,11 +91,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;

diff --git a/mod/network.php b/mod/network.php
index 2ab5b6de35b17f0b57b5c4f4de1894b3e789b67a..2524ae0634baf8a2b8895b7b1cc04e46e476224a 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -696,7 +696,7 @@ function network_content(&$a, $update = 0) {
 
        }
        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`
                                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                                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);
 
        if(! $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($items));
                }
                else {
-                       $o .= alt_pager($a,count($items));
+                       $o .= paginate($a);
                }
        }
 

diff --git a/mod/profile.php b/mod/profile.php
index 827166f92731135c093061981eec72176c43393b..abeb735fe86e5e973c09fa2f19140fed286804fa 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -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))));
                }
 
-               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`
                            FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                            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);
 
        if(! $update) {
-         if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
-                       $o .= paginate($a);
-               }
-               else {
-                       $o .= alt_pager($a,count($items));
-               }
+               if( get_config('alt_pager', 'global') || get_pconfig($a->profile['profile_uid'],'system','alt_pager') ) {
+                       $o .= paginate($a);
+               }
+               else {
+                       $o .= alt_pager($a,count($items));
+               }
        }
 
        return $o;

diff --git a/mod/search.php b/mod/search.php
index d572750986179192a5637c22180713c9299e0d2b..956816fed0ec7dc5212f4274454e5cc4a29b1e41 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -144,7 +144,7 @@ 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. 
 
-       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`
                        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
@@ -197,11 +197,11 @@ function search_content(&$a) {
 
        $o .= conversation($a,$r,'search',false);
 
-        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;