X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fviewcontacts.php;h=8b7acffbdc90fdd597a8680862101430eea1dad0;hb=3fc5c1ad840f98926319478a855dab3686a0ace3;hp=b45980fec3f6dea1eb68b029269c296af819d15a;hpb=6b44fbbda03af125035c185c964f10ce78f97610;p=friendica.git

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index b45980fec3..8b7acffbdc 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -2,86 +2,98 @@
 /**
  * @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\Database\DBM;
+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;
 
 function viewcontacts_init(App $a)
 {
-	if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
-		return;
+	if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
+		System::httpExit(403, ["title" => L10n::t('Access denied.')]);
+	}
+
+	if ($a->argc < 2) {
+		System::httpExit(403, ["title" => L10n::t('Access denied.')]);
 	}
 
 	Nav::setSelected('home');
 
-	if ($a->argc > 1) {
-		$nick = $a->argv[1];
-		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
-			dbesc($nick)
-		);
+	$nick = $a->argv[1];
+	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
+		DBA::escape($nick)
+	);
 
-		if (! DBM::is_result($r)) {
-			return;
-		}
+	if (!DBA::isResult($r)) {
+		System::httpExit(404, ["title" => L10n::t('Page not found.')]);
+	}
 
-		$a->data['user'] = $r[0];
-		$a->profile_uid = $r[0]['uid'];
-		$is_owner = (local_user() && (local_user() == $a->profile_uid));
+	$a->data['user'] = $r[0];
+	$a->profile_uid = $r[0]['uid'];
+	$is_owner = (local_user() && (local_user() == $a->profile_uid));
 
-		Profile::load($a, $a->argv[1]);
-	}
+	Profile::load($a, $a->argv[1]);
 }
 
 function viewcontacts_content(App $a)
 {
-	require_once("mod/proxy.php");
-
-	if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
+	if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
 		notice(L10n::t('Public access denied.') . EOL);
 		return;
 	}
 
+	$is_owner = $a->profile['profile_uid'] == local_user();
+
 	$o = "";
 
 	// tabs
 	$o .= Profile::getTabs($a, $is_owner, $a->data['user']['nickname']);
 
-	if (((! count($a->profile)) || ($a->profile['hide-friends']))) {
+	if (!count($a->profile) || $a->profile['hide-friends']) {
 		notice(L10n::t('Permission denied.') . EOL);
 		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']),
-		dbesc(NETWORK_DFRN),
-		dbesc(NETWORK_DIASPORA),
-		dbesc(NETWORK_OSTATUS)
+		DBA::escape(Protocol::ACTIVITYPUB),
+		DBA::escape(Protocol::DFRN),
+		DBA::escape(Protocol::DIASPORA),
+		DBA::escape(Protocol::OSTATUS)
 	);
-	if (DBM::is_result($r)) {
-		$a->set_pager_total($r[0]['total']);
+	if (DBA::isResult($r)) {
+		$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']),
-		dbesc(NETWORK_DFRN),
-		dbesc(NETWORK_DIASPORA),
-		dbesc(NETWORK_OSTATUS),
-		intval($a->pager['start']),
-		intval($a->pager['itemspage'])
+		DBA::escape(Protocol::ACTIVITYPUB),
+		DBA::escape(Protocol::DFRN),
+		DBA::escape(Protocol::DIASPORA),
+		DBA::escape(Protocol::OSTATUS),
+		$pager->getStart(),
+		$pager->getItemsPerPage()
 	);
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		info(L10n::t('No contacts.').EOL);
 		return $o;
 	}
@@ -94,32 +106,20 @@ function viewcontacts_content(App $a)
 			continue;
 		}
 
-		$url = $rr['url'];
-
-		// route DFRN profiles through the redirect
-
-		$is_owner = ((local_user() && ($a->profile['profile_uid'] == local_user())) ? true : false);
-
-		if ($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
-			$url = 'redir/' . $rr['id'];
-		} else {
-			$url = Profile::zrl($url);
-		}
-
 		$contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr);
 
 		$contacts[] = [
 			'id' => $rr['id'],
 			'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $rr['url']),
 			'photo_menu' => Contact::photoMenu($rr),
-			'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+			'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
 			'name' => htmlentities(substr($contact_details['name'], 0, 20)),
 			'username' => htmlentities($contact_details['name']),
 			'details'       => $contact_details['location'],
 			'tags'          => $contact_details['keywords'],
 			'about'         => $contact_details['about'],
 			'account_type'  => Contact::getAccountType($contact_details),
-			'url' => $url,
+			'url' => Contact::magicLink($rr['url']),
 			'sparkle' => '',
 			'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
 			'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
@@ -127,13 +127,12 @@ 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;
 }