X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=afa61ef026022256304d3e846b2bb9f7b25ea594;hb=2b7d08508d63ad5fd7fa7d4f70e3ce67ba932404;hp=281ce1dd414140d5d4cb3402df8c30d6f4b912ca;hpb=273594af62c960b5a52da5ec1cf6d6bd450415ba;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index 281ce1dd41..afa61ef026 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -11,10 +11,14 @@ function display_content(&$a) {
 	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'] .= get_markup_template('display-head.tpl');
+
+
 	$nick = (($a->argc > 1) ? $a->argv[1] : '');
 	profile_load($a,$nick);
 
@@ -63,8 +67,25 @@ function display_content(&$a) {
 		notice( t('Access to this profile has been restricted.') . EOL);
 		return;
 	}
-
-	$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
+	
+	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`,
@@ -72,6 +93,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
@@ -91,12 +113,13 @@ function display_content(&$a) {
 			);
 		}
 
-
-		$o .= conversation($a,$r,'display', false);
+		$items = conv_sort($r,"`commented`");
+		
+		$o .= conversation($a,$items,'display', false);
 
 	}
 	else {
-		$r = q("SELECT `id` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
+		$r = q("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
 			dbesc($item_id),
 			dbesc($item_id)
 		);