move js to js folder

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 305a21825f5420a0ba1a069588fe766640b0a66a..52a84e755e1dd0802b5d8e578c6447c0185fe921 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -26,8 +26,6 @@ function display_content(&$a) {
                return;
        }
 
-
-
        $groups = array();
 
        $contact = null;
@@ -59,6 +57,13 @@ function display_content(&$a) {
        if(count($r))
                $a->page_contact = $r[0];
 
+       $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+
+       if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+               notice( t('Access to this profile has been restricted.') . EOL);
+               return;
+       }
+
        $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
        $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
@@ -109,7 +114,7 @@ function display_content(&$a) {
 
        }
 
-       $o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
+       $o .= cc_license();
 
        return $o;
 }