Merge https://github.com/friendica/friendica into pull

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index da4566dc4a4c5f549c47e1a56ddbb42638a8d61f..81ed174acc46daac65f51a62327382fce2763800 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -3,8 +3,30 @@
 
 function display_content(&$a) {
 
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               notice( t('Public access denied.') . EOL);
+               return;
+       }
+
+       require_once("include/bbcode.php");
+       require_once('include/security.php');
+       require_once('include/conversation.php');
+       require_once('include/acl_selectors.php');
+
+
        $o = '<div id="live-display"></div>' . "\r\n";
 
+       $a->page['htmlhead'] .= <<<EOT
+<script>
+$(document).ready(function() {
+       $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+       // make auto-complete work in more places
+       $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+});
+</script>
+EOT;
+
+
        $nick = (($a->argc > 1) ? $a->argv[1] : '');
        profile_load($a,$nick);
 
@@ -16,10 +38,6 @@ function display_content(&$a) {
                return;
        }
 
-       require_once("include/bbcode.php");
-       require_once('include/security.php');
-
-
        $groups = array();
 
        $contact = null;
@@ -51,42 +69,31 @@ function display_content(&$a) {
        if(count($r))
                $a->page_contact = $r[0];
 
-       $sql_extra = "
-               AND `allow_cid` = '' 
-               AND `allow_gid` = '' 
-               AND `deny_cid`  = '' 
-               AND `deny_gid`  = '' 
-       ";
-
-
-       // Profile owner - everything is visible
+       $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
 
-       if(local_user() && (local_user() == $a->profile['uid'])) {
-               $sql_extra = '';                
-       }
-
-       // authenticated visitor - here lie dragons
-       // If $remotecontact is true, we know that not only is this a remotely authenticated
-       // person, but that it is *our* contact, which is important in multi-user mode.
-
-       elseif($remote_contact) {
-               $gs = '<<>>'; // should be impossible to match
-               if(count($groups)) {
-                       foreach($groups as $g)
-                               $gs .= '|<' . intval($g) . '>';
-               } 
-               $sql_extra = sprintf(
-                       " AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' ) 
-                         AND ( `deny_cid`  = '' OR  NOT `deny_cid` REGEXP '<%d>' ) 
-                         AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
-                         AND ( `deny_gid`  = '' OR  NOT `deny_gid` REGEXP '%s') ",
-
-                       intval($_SESSION['visitor_id']),
-                       intval($_SESSION['visitor_id']),
-                       dbesc($gs),
-                       dbesc($gs)
-               );
+       if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+               notice( t('Access to this profile has been restricted.') . EOL);
+               return;
        }
+       
+       if ($is_owner)
+               $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+
+               $x = array(
+                       'is_owner' => true,
+                       'allow_location' => $a->user['allow_location'],
+                       'default_location' => $a->user['default-location'],
+                       'nickname' => $a->user['nickname'],
+                       'lockstate' => ( (is_array($a->user)) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'),
+                       'acl' => populate_acl($a->user, $celeb),
+                       'bang' => '',
+                       'visitor' => 'block',
+                       'profile_uid' => local_user()
+               );      
+               $o .= status_editor($a,$x,0,true);
+
+
+       $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
        $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
                `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -94,6 +101,7 @@ function display_content(&$a) {
                `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+               and `item`.`moderated` = 0
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
                $sql_extra
@@ -113,7 +121,6 @@ function display_content(&$a) {
                        );
                }
 
-               require_once('include/conversation.php');
 
                $o .= conversation($a,$r,'display', false);
 
@@ -137,8 +144,6 @@ 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>';
-
        return $o;
 }