X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=6305dd44e7f02d3f38b510dab91b88cf701e7610;hb=6f6b1f95c855eb1e06aa73aaab8ddefd8eb970da;hp=f428149e830792819e278c25f004e12c08dff9b4;hpb=11c29e0cba4f521c5f37d963109c4807af8bccae;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
old mode 100755
new mode 100644
index f428149e83..6305dd44e7
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,7 +1,7 @@
' . "\r\n";
+ $o = '';
- $a->page['htmlhead'] .= '';
+ $a->page['htmlhead'] .= get_markup_template('display-head.tpl');
- $nick = (($a->argc > 1) ? $a->argv[1] : '');
+ if($update) {
+ $nick = $_REQUEST['nick'];
+ }
+ else {
+ $nick = (($a->argc > 1) ? $a->argv[1] : '');
+ }
profile_load($a,$nick);
- $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+ if($update) {
+ $item_id = $_REQUEST['item_id'];
+ }
+ else {
+ $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+ }
if(! $item_id) {
$a->error = 404;
@@ -35,8 +45,18 @@ function display_content(&$a) {
$contact = null;
$remote_contact = false;
- if(remote_user()) {
- $contact_id = $_SESSION['visitor_id'];
+ $contact_id = 0;
+
+ if(is_array($_SESSION['remote'])) {
+ foreach($_SESSION['remote'] as $v) {
+ if($v['uid'] == $a->profile['uid']) {
+ $contact_id = $v['cid'];
+ break;
+ }
+ }
+ }
+
+ if($contact_id) {
$groups = init_groups_visitor($contact_id);
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id),
@@ -68,7 +88,7 @@ function display_content(&$a) {
return;
}
- if ($is_owner)
+ if ($is_owner) {
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
$x = array(
@@ -83,10 +103,22 @@ function display_content(&$a) {
'profile_uid' => local_user()
);
$o .= status_editor($a,$x,0,true);
-
+ }
$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
+ if($update) {
+ $r = q("SELECT id FROM item WHERE item.uid = %d
+ AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
+ $sql_extra AND unseen = 1",
+ intval($a->profile['uid']),
+ dbesc($item_id),
+ dbesc($item_id)
+ );
+ if(!$r)
+ return '';
+ }
+
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
@@ -113,12 +145,15 @@ function display_content(&$a) {
);
}
+ $items = conv_sort($r,"`commented`");
- $o .= conversation($a,$r,'display', false);
+ if(!$update)
+ $o .= "";
+ $o .= conversation($a,$items,'display', $update);
}
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)
);