X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fallfriends.php;h=ceb32e6c1898dcefe2b2cc768c15ff609f5a9ef4;hb=4f5fb402024699ecb121d1978b54531b215a113e;hp=7623a9cd06ca4cbba5be8bb9e15d4fe547b6729b;hpb=7edbef9bdc8336e6e842994c3e45f8f29325328a;p=friendica.git

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 7623a9cd06..ceb32e6c18 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -5,16 +5,15 @@
 
 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 +41,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->set_pager_total($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 +58,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 +67,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]
 			];
 		}
@@ -80,13 +79,13 @@ function allfriends_content(App $a)
 		$entry = [
 			'url'          => $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'],
-			'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 +95,13 @@ 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');
-
-	$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;