X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fviewcontacts.php;h=af5ecd9d67011b5daaeace861600026cd7cd3975;hb=0448ca38973fed14840d33079989fd71af93708b;hp=a918c1ae57963eb06ce1f188f8c5863bdc2e0805;hpb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;p=friendica.git

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index a918c1ae57..af5ecd9d67 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -4,20 +4,22 @@
  */
 use Friendica\App;
 use Friendica\Content\ContactSelector;
+use Friendica\Content\Nav;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 
-function viewcontacts_init(App $a) {
-
-	if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+function viewcontacts_init(App $a)
+{
+	if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
 		return;
 	}
 
-	nav_set_selected('home');
+	Nav::setSelected('home');
 
-	if($a->argc > 1) {
+	if ($a->argc > 1) {
 		$nick = $a->argv[1];
 		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
 			dbesc($nick)
@@ -35,22 +37,24 @@ function viewcontacts_init(App $a) {
 	}
 }
 
-
-function viewcontacts_content(App $a) {
+function viewcontacts_content(App $a)
+{
 	require_once("mod/proxy.php");
 
-	if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
-		notice( t('Public access denied.') . EOL);
+	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']))) {
-		notice( t('Permission denied.') . EOL);
+	if (((! count($a->profile)) || ($a->profile['hide-friends']))) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return $o;
 	}
 
@@ -63,8 +67,9 @@ function viewcontacts_content(App $a) {
 		dbesc(NETWORK_DIASPORA),
 		dbesc(NETWORK_OSTATUS)
 	);
-	if (DBM::is_result($r))
+	if (DBM::is_result($r)) {
 		$a->set_pager_total($r[0]['total']);
+	}
 
 	$r = q("SELECT * FROM `contact`
 		WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
@@ -79,7 +84,7 @@ function viewcontacts_content(App $a) {
 		intval($a->pager['itemspage'])
 	);
 	if (!DBM::is_result($r)) {
-		info(t('No contacts.').EOL);
+		info(L10n::t('No contacts.').EOL);
 		return $o;
 	}
 
@@ -91,31 +96,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' => sprintf( t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
+			'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),
-			'name' => htmlentities(substr($contact_details['name'],0,20)),
+			'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']),
@@ -125,7 +119,7 @@ function viewcontacts_content(App $a) {
 
 	$tpl = get_markup_template("viewcontact_template.tpl");
 	$o .= replace_macros($tpl, [
-		'$title' => t('Contacts'),
+		'$title' => L10n::t('Contacts'),
 		'$contacts' => $contacts,
 		'$paginate' => paginate($a),
 	]);