X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fviewcontacts.php;h=8b7acffbdc90fdd597a8680862101430eea1dad0;hb=be6031aa1b859cefc75b84f25baba7c213204cc2;hp=563c13c6d4ada9ccc0242731ff29f650147e38e3;hpb=a97b540ebb3f1d5bb5c18b4c0fb631443d03b5a7;p=friendica.git

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 563c13c6d4..8b7acffbdc 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -2,17 +2,20 @@
 /**
  * @file mod/viewcontacts.php
  */
+
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
+use Friendica\Content\Pager;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Core\System;
 
 function viewcontacts_init(App $a)
 {
@@ -61,30 +64,34 @@ function viewcontacts_content(App $a)
 		return $o;
 	}
 
+	$total = 0;
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact`
 		WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
 			AND NOT `hidden` AND NOT `archive`
-			AND `network` IN ('%s', '%s', '%s')",
+			AND `network` IN ('%s', '%s', '%s', '%s')",
 		intval($a->profile['uid']),
+		DBA::escape(Protocol::ACTIVITYPUB),
 		DBA::escape(Protocol::DFRN),
 		DBA::escape(Protocol::DIASPORA),
 		DBA::escape(Protocol::OSTATUS)
 	);
 	if (DBA::isResult($r)) {
-		$a->setPagerTotal($r[0]['total']);
+		$total = $r[0]['total'];
 	}
+	$pager = new Pager($a->query_string);
 
 	$r = q("SELECT * FROM `contact`
 		WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
 			AND NOT `hidden` AND NOT `archive`
-			AND `network` IN ('%s', '%s', '%s')
+			AND `network` IN ('%s', '%s', '%s', '%s')
 		ORDER BY `name` ASC LIMIT %d, %d",
 		intval($a->profile['uid']),
+		DBA::escape(Protocol::ACTIVITYPUB),
 		DBA::escape(Protocol::DFRN),
 		DBA::escape(Protocol::DIASPORA),
 		DBA::escape(Protocol::OSTATUS),
-		intval($a->pager['start']),
-		intval($a->pager['itemspage'])
+		$pager->getStart(),
+		$pager->getItemsPerPage()
 	);
 	if (!DBA::isResult($r)) {
 		info(L10n::t('No contacts.').EOL);
@@ -120,11 +127,11 @@ function viewcontacts_content(App $a)
 	}
 
 
-	$tpl = get_markup_template("viewcontact_template.tpl");
-	$o .= replace_macros($tpl, [
+	$tpl = Renderer::getMarkupTemplate("viewcontact_template.tpl");
+	$o .= Renderer::replaceMacros($tpl, [
 		'$title' => L10n::t('Contacts'),
 		'$contacts' => $contacts,
-		'$paginate' => paginate($a),
+		'$paginate' => $pager->renderFull($total),
 	]);
 
 	return $o;