bug #70 - error messages on group deletion, warning cleanup

[friendica.git] / mod / viewcontacts.php

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 90ff85b9dbd4476c3534a6138b108f1d6608d613..732607b182aaf98517dc52fb7e5042345f141f57 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;
@@ -33,7 +41,7 @@ function viewcontacts_content(&$a) {
                return $o;
        }
 
-       $tpl = load_view_file("view/viewcontact_template.tpl");
+       $tpl = get_markup_template("viewcontact_template.tpl");
 
        foreach($r as $rr) {
                if($rr['self'])
@@ -41,9 +49,10 @@ function viewcontacts_content(&$a) {
 
                $o .= replace_macros($tpl, array(
                        '$id' => $rr['id'],
-                       '$alt_text' => t('Visit ') . $rr['name'] . t('\'s profile'),
+                       '$alt_text' => t('Visit $username\'s profile'),
                        '$thumb' => $rr['thumb'], 
                        '$name' => substr($rr['name'],0,20),
+                       '$username' => $rr['name'],
                        '$url' => $rr['url'] 
                ));
        }