strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2188 from rabuzarus/1512_allfriends_pager

Browse source 
add pager to common friends and allfriends
This commit is contained in:
Michael Vogel 2015-12-15 14:53:06 +01:00
commit 8972c8c219
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mod/allfriends.php
View file

@ -32,7 +32,12 @@ function allfriends_content(&$a) {
$a->page['aside'] = "";
profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"]));
$r = all_friends(local_user(),$cid);
$total = count_all_friends(local_user(), $cid);
if(count($total))
$a->set_pager_total($total);
$r = all_friends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
if(! count($r)) {
$o .= t('No friends to display.');
@ -87,8 +92,8 @@ function allfriends_content(&$a) {
//'$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])),
'$tab_str' => $tab_str,
'$contacts' => $entries,
'$paginate' => paginate($a),
));
// $o .= paginate($a);
return $o;
}

15
mod/common.php
View file

@ -76,23 +76,22 @@ function common_content(&$a) {
if($cid)
$t = count_common_friends($uid,$cid);
$t = count_common_friends($uid, $cid);
else
$t = count_common_friends_zcid($uid,$zcid);
$t = count_common_friends_zcid($uid, $zcid);
if(count($t))
$a->set_pager_total($t);
if(! $t) {
else {
notice( t('No contacts in common.') . EOL);
return $o;
}
if($cid)
$r = common_friends($uid,$cid);
$r = common_friends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
else
$r = common_friends_zcid($uid,$zcid);
$r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
if(! count($r)) {
@ -140,8 +139,8 @@ function common_content(&$a) {
'$title' => $title,
'$tab_str' => $tab_str,
'$contacts' => $entries,
'$paginate' => paginate($a),
));
// $o .= paginate($a);
return $o;
}