X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=2ac1c369ebc33cc2852a25b6573d7fbe236e4ed4;hb=c9307eb96a1cd6f0f99ef01127a3ec6d356543ef;hp=f428149e830792819e278c25f004e12c08dff9b4;hpb=e25fb2b2f9a822fa7180448ddff7f558dfc34fee;p=friendica.git diff --git a/mod/display.php b/mod/display.php old mode 100755 new mode 100644 index f428149e83..2ac1c369eb --- a/mod/display.php +++ b/mod/display.php @@ -1,7 +1,19 @@ argc > 1) ? $a->argv[1] : ''); + profile_load($a,$nick); + +} + + +function display_content(&$a, $update = 0) { if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { notice( t('Public access denied.') . EOL); @@ -14,15 +26,25 @@ function display_content(&$a) { require_once('include/acl_selectors.php'); - $o = '
' . "\r\n"; + $o = ''; - $a->page['htmlhead'] .= ''; + $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array()); - $nick = (($a->argc > 1) ? $a->argv[1] : ''); - profile_load($a,$nick); + if($update) { + $nick = $_REQUEST['nick']; + } + else { + $nick = (($a->argc > 1) ? $a->argv[1] : ''); + } - $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); + if($update) { + $item_id = $_REQUEST['item_id']; + $a->profile = array('uid' => intval($update), 'profile_uid' => intval($update)); + } + else { + $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); + } if(! $item_id) { $a->error = 404; @@ -35,8 +57,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 +100,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 +115,25 @@ 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) { + +dbg(1); + $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) + ); +dbg(0); + 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 +160,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) );