X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fallfriends.php;h=ce648cc25a4844f7e428b918379c005937d06041;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=cee067e97acf1ab9791a667a89f4bea89c175209;hpb=389685e09944e3823effd2e820ab2fd95d8b4b32;p=friendica.git

diff --git a/mod/allfriends.php b/mod/allfriends.php
index cee067e97a..ce648cc25a 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -5,7 +5,9 @@
 
 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;
@@ -13,8 +15,6 @@ 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'],
@@ -97,13 +95,11 @@ function allfriends_content(App $a)
 
 	$tab_str = Module\Contact::getTabsHTML($a, $contact, 4);
 
-	$tpl = get_markup_template('viewcontact_template.tpl');
-
-	$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;