Fixing double encoding here as well

[friendica.git] / mod / allfriends.php

diff --git a/mod/allfriends.php b/mod/allfriends.php
index b41d0c891be7ec7feceb100b80404882f5c7cbe4..b233a46182050ddc8d37b3d266950117bb300132 100644 (file)
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -5,16 +5,17 @@
 
 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\Contact;
-use Friendica\Model\GContact;
-use Friendica\Model\Profile;
+use Friendica\Model;
+use Friendica\Module;
 use Friendica\Util\Proxy as ProxyUtils;
 
+
 require_once 'include/dba.php';
-require_once 'mod/contacts.php';
 
 function allfriends_content(App $a)
 {
@@ -42,13 +43,13 @@ function allfriends_content(App $a)
        }
 
        $a->page['aside'] = "";
-       Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
+       Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
 
-       $total = GContact::countAllFriends(local_user(), $cid);
+       $total = Model\GContact::countAllFriends(local_user(), $cid);
 
-       $a->setPagerTotal($total);
+       $pager = new Pager($a->query_string);
 
-       $r = 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;
@@ -59,7 +60,7 @@ function allfriends_content(App $a)
        $entries = [];
        foreach ($r as $rr) {
                //get further details of the contact
-               $contact_details = Contact::getDetailsByURL($rr['url'], $uid, $rr);
+               $contact_details = Model\Contact::getDetailsByURL($rr['url'], $uid, $rr);
 
                $photo_menu = '';
 
@@ -68,11 +69,11 @@ function allfriends_content(App $a)
                // If the contact is not common to the user, Connect/Follow' will be added to the photo menu
                if ($rr['cid']) {
                        $rr['id'] = $rr['cid'];
-                       $photo_menu = Contact::photoMenu($rr);
+                       $photo_menu = Model\Contact::photoMenu($rr);
                } else {
                        $connlnk = System::baseUrl() . '/follow/?url=' . $rr['url'];
                        $photo_menu = [
-                               'profile' => [L10n::t("View Profile"), Contact::magicLink($rr['url'])],
+                               'profile' => [L10n::t("View Profile"), Model\Contact::magicLink($rr['url'])],
                                'follow' => [L10n::t("Connect/Follow"), $connlnk]
                        ];
                }
@@ -86,7 +87,7 @@ function allfriends_content(App $a)
                        'details'      => $contact_details['location'],
                        'tags'         => $contact_details['keywords'],
                        'about'        => $contact_details['about'],
-                       'account_type' => Contact::getAccountType($contact_details),
+                       'account_type' => Model\Contact::getAccountType($contact_details),
                        'network'      => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
                        'photo_menu'   => $photo_menu,
                        'conntxt'      => L10n::t('Connect'),
@@ -96,15 +97,15 @@ function allfriends_content(App $a)
                $entries[] = $entry;
        }
 
-       $tab_str = contacts_tab($a, $contact, 4);
+       $tab_str = Module\Contact::getTabsHTML($a, $contact, 4);
 
-       $tpl = get_markup_template('viewcontact_template.tpl');
+       $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-       $o .= replace_macros($tpl, [
+       $o .= Renderer::replaceMacros($tpl, [
                //'$title' => L10n::t('Friends of %s', htmlentities($c[0]['name'])),
                '$tab_str' => $tab_str,
                '$contacts' => $entries,
-               '$paginate' => paginate($a),
+               '$paginate' => $pager->renderFull($total),
        ]);
 
        return $o;