X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fviewcontacts.php;h=f9510bd6b43af52f6eb0d23fce5514ba14acaaaf;hb=906addf865ccab2c98d5035fc6c1b10d43004dfe;hp=47132e6a8218cd9e417ce7385bbe94bd76cdfc61;hpb=050be990349b75f38095242347b2e13b9bb579f7;p=friendica.git

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 47132e6a82..f9510bd6b4 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -2,14 +2,21 @@
 
 function viewcontacts_init(&$a) {
 
-	require_once("mod/profile.php");
-	profile_load($a,$a->argv[1]);
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		return;
+	}
 
+	profile_load($a,$a->argv[1]);
 }
 
 
 function viewcontacts_content(&$a) {
 
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		notice( t('Public access denied.') . EOL);
+		return;
+	}
+
 	if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
 		notice( t('Permission denied.') . EOL);
 		return;
@@ -22,7 +29,7 @@ function viewcontacts_content(&$a) {
 		intval($a->profile['uid'])
 	);
 	if(count($r))
-		$a->pager['totalitems'] = $r[0]['total'];
+		$a->set_pager_total($r[0]['total']);
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 ORDER BY `name` ASC LIMIT %d , %d ",
 		intval($a->profile['uid']),
@@ -30,22 +37,32 @@ function viewcontacts_content(&$a) {
 		intval($a->pager['itemspage'])
 	);
 	if(! count($r)) {
-		notice( t('No contacts.') . EOL );
+		info( t('No contacts.') . EOL );
 		return $o;
 	}
 
-	$tpl = file_get_contents("view/viewcontact_template.tpl");
+	$tpl = get_markup_template("viewcontact_template.tpl");
 
 	foreach($r as $rr) {
 		if($rr['self'])
 			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'];
+
 		$o .= replace_macros($tpl, array(
 			'$id' => $rr['id'],
-			'$alt_text' => t('Visit ') . $rr['name'] . t('\'s profile'),
+			'$alt_text' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']),
 			'$thumb' => $rr['thumb'], 
-			'$name' => $rr['name'],
-			'$url' => $rr['url'] 
+			'$name' => substr($rr['name'],0,20),
+			'$username' => $rr['name'],
+			'$url' => $url
 		));
 	}
 
@@ -54,4 +71,4 @@ function viewcontacts_content(&$a) {
 	$o .= paginate($a);
 
 	return $o;
-}
\ No newline at end of file
+}