Merge remote-tracking branch 'upstream/develop' into 1608-performance

[friendica.git] / mod / allfriends.php

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 8396efdd2d4eb185f2d7ef807edd2750c60ed64b..498b9d7dbf1cf62b0b61eff85aec17e8575ace5b 100644 (file)
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -3,6 +3,7 @@
 require_once('include/socgraph.php');
 require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
+require_once('mod/contacts.php');
 
 function allfriends_content(&$a) {
 
@@ -25,21 +26,18 @@ function allfriends_content(&$a) {
                intval(local_user())
        );
 
-       $vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
-               '$name'  => htmlentities($c[0]['name']),
-               '$photo' => $c[0]['photo'],
-               'url'    => z_root() . '/contacts/' . $cid
-       ));
-
-       if(! x($a->page,'aside'))
-               $a->page['aside'] = '';
-       $a->page['aside'] .= $vcard_widget;
-
        if(! count($c))
                return;
 
+       $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.');
@@ -51,7 +49,7 @@ function allfriends_content(&$a) {
        foreach($r as $rr) {
 
                //get further details of the contact
-               $contact_details = get_contact_details_by_url($rr['url'], $uid);
+               $contact_details = get_contact_details_by_url($rr['url'], $uid, $rr);
 
                $photo_menu = '';
 
@@ -63,16 +61,18 @@ function allfriends_content(&$a) {
                }
                else {
                        $connlnk = $a->get_baseurl() . '/follow/?url=' . $rr['url'];
-                       $photo_menu = array(array(t("View Profile"), zrl($rr['url'])));
-                       $photo_menu[] = array(t("Connect/Follow"), $connlnk);
+                       $photo_menu = array(
+                               'profile' => array(t("View Profile"), zrl($rr['url'])),
+                               'follow' => array(t("Connect/Follow"), $connlnk)
+                       );
                }
 
                $entry = array(
                        'url'           => $rr['url'],
-                       'itemurl'       => $rr['url'],
-                       'name'          => htmlentities($rr['name']),
-                       'thumb'         => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
-                       'img_hover'     => htmlentities($rr['name']),
+                       'itemurl'       => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+                       'name'          => htmlentities($contact_details['name']),
+                       'thumb'         => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+                       'img_hover'     => htmlentities($contact_details['name']),
                        'details'       => $contact_details['location'],
                        'tags'          => $contact_details['keywords'],
                        'about'         => $contact_details['about'],
@@ -86,13 +86,16 @@ function allfriends_content(&$a) {
                $entries[] = $entry;
        }
 
+       $tab_str = contacts_tab($a, $cid, 3);
+
        $tpl = get_markup_template('viewcontact_template.tpl');
 
        $o .= replace_macros($tpl,array(
-               '$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])),
+               //'$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])),
+               '$tab_str' => $tab_str,
                '$contacts' => $entries,
+               '$paginate' => paginate($a),
        ));
 
-//     $o .= paginate($a);
        return $o;
 }