BBCode - fixed syntax error

[friendica.git] / mod / allfriends.php

diff --git a/mod/allfriends.php b/mod/allfriends.php
index aa5fb0a679430dadddae06deb58e5bc67826e8de..ce648cc25a4844f7e428b918379c005937d06041 100644 (file)
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -5,16 +5,16 @@
 
 use Friendica\App;
 use Friendica\Content\ContactSelector;
+use Friendica\Content\Pager;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Model;\
-use Friendica\Module\Contact;
+use Friendica\Model;
+use Friendica\Module;
 use Friendica\Util\Proxy as ProxyUtils;
 
 
-require_once 'include/dba.php';
-
 function allfriends_content(App $a)
 {
        $o = '';
@@ -45,9 +45,9 @@ function allfriends_content(App $a)
 
        $total = Model\GContact::countAllFriends(local_user(), $cid);
 
-       $a->setPagerTotal($total);
+       $pager = new Pager($a->query_string);
 
-       $r = Model\GContact::allFriends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
+       $r = Model\GContact::allFriends(local_user(), $cid, $pager->getStart(), $pager->getItemsPerPage());
        if (!DBA::isResult($r)) {
                $o .= L10n::t('No friends to display.');
                return $o;
@@ -60,8 +60,6 @@ function allfriends_content(App $a)
                //get further details of the contact
                $contact_details = Model\Contact::getDetailsByURL($rr['url'], $uid, $rr);
 
-               $photo_menu = '';
-
                $connlnk = '';
                // $rr[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photo_menu
                // If the contact is not common to the user, Connect/Follow' will be added to the photo menu
@@ -77,11 +75,11 @@ function allfriends_content(App $a)
                }
 
                $entry = [
-                       'url'          => $rr['url'],
+                       'url'          => Model\Contact::magicLink($rr['url']),
                        'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
-                       'name'         => htmlentities($contact_details['name']),
+                       'name'         => $contact_details['name'],
                        'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
-                       'img_hover'    => htmlentities($contact_details['name']),
+                       'img_hover'    => $contact_details['name'],
                        'details'      => $contact_details['location'],
                        'tags'         => $contact_details['keywords'],
                        'about'        => $contact_details['about'],
@@ -95,15 +93,13 @@ function allfriends_content(App $a)
                $entries[] = $entry;
        }
 
-       $tab_str = Contact::getTabsHTML($a, $contact, 4);
-
-       $tpl = get_markup_template('viewcontact_template.tpl');
+       $tab_str = Module\Contact::getTabsHTML($a, $contact, 4);
 
-       $o .= replace_macros($tpl, [
-               //'$title' => L10n::t('Friends of %s', htmlentities($c[0]['name'])),
+       $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+       $o .= Renderer::replaceMacros($tpl, [
                '$tab_str' => $tab_str,
                '$contacts' => $entries,
-               '$paginate' => paginate($a),
+               '$paginate' => $pager->renderFull($total),
        ]);
 
        return $o;