add alt_pager function, add ability to use new pager logic on network, profile, commu...

diff --git a/include/text.php b/include/text.php
index 409d40d59f6155a6a5533e986ff7a29b99ea9329..a35c9a8d6752941d9fa7c4e02bad0cd7f9523530 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -280,6 +280,31 @@ function paginate(&$a) {
        return $o;
 }}
 
+if(! function_exists('alt_pager')) {
+function alt_pager(&$a, $i) {
+        $o = '';
+       $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+       $stripped = str_replace('q=','',$stripped);
+       $stripped = trim($stripped,'/');
+       $pagenum = $a->pager['page'];
+        $url = $a->get_baseurl() . '/' . $stripped;
+
+        $o .= '<div class="pager">';
+
+       if($a->pager['page']>1)
+         $o .= "<a href=\"$url"."&page=".($a->pager['page'] - 1).'">' . t('newer') . '</a>';
+        if($i>0) {
+          if($a->pager['page']>1)
+                 $o .= "&nbsp;-&nbsp;";
+         $o .= "<a href=\"$url"."&page=".($a->pager['page'] + 1).'">' . t('older') . '</a>';
+       }
+
+
+        $o .= '</div>'."\r\n";
+
+       return $o;
+}}
+
 // Turn user/group ACLs stored as angle bracketed text into arrays
 
 if(! function_exists('expand_acl')) {

diff --git a/mod/community.php b/mod/community.php
index becb5642b1d857aa65e2f5ecde51a17ce2f4039e..354f68528dab479e8e1565ec08b75d64fbf20841 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -44,22 +44,24 @@ 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;
+               }
 
-       $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;
        }
 
        $r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
@@ -70,9 +72,9 @@ function community_content(&$a, $update = 0) {
                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`.`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 `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 group by `item`.`uri`
                ORDER BY `received` DESC LIMIT %d, %d ",
                intval($a->pager['start']),
@@ -80,11 +82,21 @@ function community_content(&$a, $update = 0) {
 
        );
 
+       if(! count($r)) {
+               info( t('No results.') . EOL);
+               return $o;
+       }
+
        // we behave the same in message lists as the search module
 
        $o .= conversation($a,$r,'community',$update);
 
-       $o .= paginate($a);
+        if(! get_pconfig(local_user(),'system','alt_pager')) {
+               $o .= paginate($a);
+       }
+       else {
+               $o .= alt_pager($a,count($r));
+       }
 
        return $o;
 }

diff --git a/mod/network.php b/mod/network.php
index 3d8fa7c1443e4849280017246dcc0a68a1c38f74..17368ab92d1f6ce4d7dd1251073b9cac89e97088 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -563,21 +563,23 @@ function network_content(&$a, $update = 0) {
 
        }
        else {
-               $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
-                       AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-                       $sql_extra2 $sql_extra3
-                       $sql_extra $sql_nets ",
-                       intval($_SESSION['uid'])
-               );
-
-               if(count($r)) {
-                       $a->set_pager_total($r[0]['total']);
-                       $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
-                        $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
-               }
-               $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
+               if(! 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
+                               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+                               $sql_extra2 $sql_extra3
+                               $sql_extra $sql_nets ",
+                               intval($_SESSION['uid'])
+                       );
+
+                       if(count($r)) {
+                               $a->set_pager_total($r[0]['total']);
+                       }
+                }
+                $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+                $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
+                $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
        }
 
        $simple_update = (($update) ? " and `item`.`unseen` = 1 " : '');
@@ -688,7 +690,12 @@ function network_content(&$a, $update = 0) {
        $o .= conversation($a,$items,$mode,$update);
 
        if(! $update) {
-               $o .= paginate($a);
+               if(! get_pconfig(local_user(),'system','alt_pager')) {
+                       $o .= paginate($a);
+               }
+               else {
+                       $o .= alt_pager($a,count($items));
+               }
        }
 
        return $o;

diff --git a/mod/profile.php b/mod/profile.php
index b142943c1e9121f2fb80a769d7c2f9cb0d7877f3..78fb5487cdc36616a7d8ec82a61fc62b96fc7f24 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -229,20 +229,21 @@ function profile_content(&$a, $update = 0) {
                        $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
                }
 
-
-               $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
-                       and `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
-                       AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
-                       $sql_extra $sql_extra2 ",
-                       intval($a->profile['profile_uid'])
-               );
-
-               if(count($r)) {
-                       $a->set_pager_total($r[0]['total']);
-                       $a->set_pager_itemspage(40);
+                if(! 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
+                               and `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+                               AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
+                               $sql_extra $sql_extra2 ",
+                               intval($a->profile['profile_uid'])
+                       );
+
+                       if(count($r)) {
+                               $a->set_pager_total($r[0]['total']);
+               }
                }
+               $a->set_pager_itemspage(40);
 
                $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
 
@@ -313,7 +314,12 @@ function profile_content(&$a, $update = 0) {
        $o .= conversation($a,$items,'profile',$update);
 
        if(! $update) {
-               $o .= paginate($a);
+         if(! 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 320ffddcef2fbc0df671e6c58e5c26937372711a..8f73b92448d7630e02fd1fc105612dcf7853fd92 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -128,21 +128,24 @@ 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_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`, 
@@ -165,6 +168,12 @@ function search_content(&$a) {
 
        );
 
+       if(! count($r)) {
+               info( t('No results.') . EOL);
+               return $o;
+       }
+
+
        if($tag) 
                $o .= '<h2>Items tagged with: ' . $search . '</h2>';
        else
@@ -172,7 +181,12 @@ function search_content(&$a) {
 
        $o .= conversation($a,$r,'search',false);
 
-       $o .= paginate($a);
+        if(! get_pconfig(local_user(),'system','alt_pager')) {
+               $o .= paginate($a);
+       }
+       else {
+               $o .= alt_pager($a,count($r));
+       }
 
        return $o;
 }