Merge branch 'pull'

[friendica.git] / mod / viewcontacts.php

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 063637bf9e2d26e8d98e9f606a4ba801842c2e2c..f9510bd6b43af52f6eb0d23fce5514ba14acaaaf 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -2,13 +2,21 @@
 
 function viewcontacts_init(&$a) {
 
-       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;
@@ -29,23 +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 = load_view_file("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 $username\'s profile'),
+                       '$alt_text' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']),
                        '$thumb' => $rr['thumb'], 
                        '$name' => substr($rr['name'],0,20),
                        '$username' => $rr['name'],
-                       '$url' => $rr['url'] 
+                       '$url' => $url
                ));
        }
 
@@ -54,4 +71,4 @@ function viewcontacts_content(&$a) {
        $o .= paginate($a);
 
        return $o;
-}
\ No newline at end of file
+}