X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=da41c8656e9499d28fd26e8685b00dbfddac6379;hb=7ce97459d437a98ece0077b28bb36771aa36ed82;hp=07289e01325bcbb42bfc082f0bd08cca1bb433c8;hpb=edf9bdfa144795edb121d04eb0f40dfa6a73bea8;p=friendica.git diff --git a/mod/display.php b/mod/display.php index 07289e0132..da41c8656e 100644 --- a/mod/display.php +++ b/mod/display.php @@ -1,6 +1,6 @@ $a->argv[1] ?? null]); + (new Objects(DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), $_SERVER, ['guid' => DI::args()->getArgv()[1] ?? null]))->run(); } if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) { return; } - $nick = (($a->argc > 1) ? $a->argv[1] : ''); + $nick = ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : ''); $item = null; $item_user = local_user(); - $fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid', 'gravity']; + $fields = ['uri-id', 'parent-uri-id', 'author-id', 'author-link', 'body', 'uid', 'guid', 'gravity']; // If there is only one parameter, then check if this parameter could be a guid - if ($a->argc == 2) { - $nick = ""; + if (DI::args()->getArgc() == 2) { + $nick = ''; // Does the local user have this item? if (local_user()) { - $item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]); + $item = Post::selectFirstForUser(local_user(), $fields, ['guid' => DI::args()->getArgv()[1], 'uid' => local_user()]); if (DBA::isResult($item)) { - $nick = $a->user["nickname"]; + $nick = $a->getLoggedInUserNickname(); } } // Is this item private but could be visible to the remove visitor? if (!DBA::isResult($item) && remote_user()) { - $item = Post::selectFirst($fields, ['guid' => $a->argv[1], 'private' => Item::PRIVATE, 'origin' => true]); + $item = Post::selectFirst($fields, ['guid' => DI::args()->getArgv()[1], 'private' => Item::PRIVATE, 'origin' => true]); if (DBA::isResult($item)) { if (!Contact::isFollower(remote_user(), $item['uid'])) { $item = null; @@ -83,95 +80,51 @@ function display_init(App $a) // Is it an item with uid=0? if (!DBA::isResult($item)) { - $item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]); + $item = Post::selectFirstForUser(local_user(), $fields, ['guid' => DI::args()->getArgv()[1], 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]); } - } elseif ($a->argc >= 3 && $nick == 'feed-item') { - $item_id = $a->argv[2]; - if (substr($item_id, -5) == '.atom') { - $item_id = substr($item_id, 0, -5); + } elseif (DI::args()->getArgc() >= 3 && $nick == 'feed-item') { + $uri_id = DI::args()->getArgv()[2]; + if (substr($uri_id, -5) == '.atom') { + $uri_id = substr($uri_id, 0, -5); } - $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item_id, 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]); + $item = Post::selectFirstForUser(local_user(), $fields, ['uri-id' => $uri_id, 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]); } if (!DBA::isResult($item)) { return; } - if ($a->argc >= 3 && $nick == 'feed-item') { - displayShowFeed($item['id'], $a->argc > 3 && $a->argv[3] == 'conversation.atom'); + if (DI::args()->getArgc() >= 3 && $nick == 'feed-item') { + displayShowFeed($item['uri-id'], $item['uid'], DI::args()->getArgc() > 3 && DI::args()->getArgv()[3] == 'conversation.atom'); } if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) { - Logger::log('Directly serving XML for id '.$item['id'], Logger::DEBUG); - displayShowFeed($item['id'], false); + Logger::info('Directly serving XML for uri-id '.$item['uri-id']); + displayShowFeed($item['uri-id'], $item['uid'], false); } if ($item['gravity'] != GRAVITY_PARENT) { - $parent = Item::selectFirstForUser($item_user, $fields, ['id' => $item['parent']]); + $parent = Post::selectFirstForUser($item_user, $fields, ['uid' => $item['uid'], 'uri-id' => $item['parent-uri-id']]); $item = $parent ?: $item; } - $profiledata = display_fetchauthor($a, $item); - - if (strstr(Strings::normaliseLink($profiledata['url']), Strings::normaliseLink(DI::baseUrl()))) { - $nickname = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/profile/', '', Strings::normaliseLink($profiledata['url'])); - - if (!empty($a->user['nickname']) && $nickname != $a->user['nickname']) { - $profile = DBA::selectFirst('owner-view', [], ['nickname' => $nickname]); - if (DBA::isResult($profile)) { - $profiledata = $profile; - } - $profiledata["network"] = Protocol::DFRN; - } else { - $profiledata = []; - } - } - - Profile::load($a, $nick, $profiledata); + DI::page()['aside'] = Widget\VCard::getHTML(display_fetchauthor($item)); } -function display_fetchauthor($a, $item) +function display_fetchauthor($item) { - $author = DBA::selectFirst('contact', ['name', 'nick', 'photo', 'network', 'url'], ['id' => $item['author-id']]); - - $profiledata = []; - $profiledata['uid'] = -1; - $profiledata['nickname'] = $author['nick']; - $profiledata['name'] = $author['name']; - $profiledata['picdate'] = ''; - $profiledata['photo'] = $author['photo']; - $profiledata['url'] = $author['url']; - $profiledata['network'] = $author['network']; - - // Check for a repeated message - $shared = Item::getShareArray($item); - if (!empty($shared) && empty($shared['comment'])) { - if (!empty($shared['author'])) { - $profiledata['name'] = $shared['author']; - } - + if (Diaspora::isReshare($item['body'], true)) { + $shared = Item::getShareArray($item); if (!empty($shared['profile'])) { - $profiledata['url'] = $shared['profile']; - } - - if (!empty($shared['avatar'])) { - $profiledata['photo'] = $shared['avatar']; + $contact = Contact::getByURLForUser($shared['profile'], local_user()); } - - $profiledata["nickname"] = $profiledata["name"]; - $profiledata["network"] = Protocol::matchByProfileUrl($profiledata["url"]); - - $profiledata["address"] = ""; - $profiledata["about"] = ""; } - $profiledata = Contact::getByURLForUser($profiledata["url"], local_user()) ?: $profiledata; - - if (!empty($profiledata["photo"])) { - $profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]); + if (empty($contact)) { + $contact = Contact::getById($item['author-id']); } - return $profiledata; + return $contact; } function display_content(App $a, $update = false, $update_uid = 0) @@ -187,49 +140,46 @@ function display_content(App $a, $update = false, $update_uid = 0) $force = (bool)($_REQUEST['force'] ?? false); if ($update) { - $item_id = $_REQUEST['item_id']; - $item = Post::selectFirst(['uid', 'parent', 'parent-uri', 'parent-uri-id'], ['id' => $item_id]); - if ($item['uid'] != 0) { - $a->profile = ['uid' => intval($item['uid'])]; - } else { - $a->profile = ['uid' => intval($update_uid)]; + $uri_id = $_REQUEST['uri_id']; + $item = Post::selectFirst(['uid', 'parent-uri-id'], ['uri-id' => $uri_id, 'uid' => [0, $update_uid]], ['order' => ['uid' => true]]); + if (!empty($item)) { + if ($item['uid'] != 0) { + $a->setProfileOwner($item['uid']); + } else { + $a->setProfileOwner($update_uid); + } + $parent_uri_id = $item['parent-uri-id']; } - $item_parent = $item['parent']; - $item_parent_uri = $item['parent-uri']; } else { - $item_id = (($a->argc > 2) ? $a->argv[2] : 0); - $item_parent = $item_id; + $uri_id = ((DI::args()->getArgc() > 2) ? DI::args()->getArgv()[2] : 0); + $parent_uri_id = $uri_id; - if ($a->argc == 2) { - $item_parent = 0; - $fields = ['id', 'parent', 'parent-uri', 'parent-uri-id', 'uid']; + if (DI::args()->getArgc() == 2) { + $fields = ['uri-id', 'parent-uri-id', 'uid']; if (local_user()) { - $condition = ['guid' => $a->argv[1], 'uid' => local_user()]; - $item = Item::selectFirstForUser(local_user(), $fields, $condition); + $condition = ['guid' => DI::args()->getArgv()[1], 'uid' => [0, local_user()]]; + $item = Post::selectFirstForUser(local_user(), $fields, $condition, ['order' => ['uid' => true]]); if (DBA::isResult($item)) { - $item_id = $item['id']; - $item_parent = $item['parent']; - $item_parent_uri = $item['parent-uri']; + $uri_id = $item['uri-id']; + $parent_uri_id = $item['parent-uri-id']; } } - if (($item_parent == 0) && remote_user()) { - $item = Post::selectFirst($fields, ['guid' => $a->argv[1], 'private' => Item::PRIVATE, 'origin' => true]); + if (($parent_uri_id == 0) && remote_user()) { + $item = Post::selectFirst($fields, ['guid' => DI::args()->getArgv()[1], 'private' => Item::PRIVATE, 'origin' => true]); if (DBA::isResult($item) && Contact::isFollower(remote_user(), $item['uid'])) { - $item_id = $item['id']; - $item_parent = $item['parent']; - $item_parent_uri = $item['parent-uri']; + $uri_id = $item['uri-id']; + $parent_uri_id = $item['parent-uri-id']; } } - if ($item_parent == 0) { - $condition = ['private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $a->argv[1], 'uid' => 0]; - $item = Item::selectFirstForUser(local_user(), $fields, $condition); + if ($parent_uri_id == 0) { + $condition = ['private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => DI::args()->getArgv()[1], 'uid' => 0]; + $item = Post::selectFirstForUser(local_user(), $fields, $condition); if (DBA::isResult($item)) { - $item_id = $item['id']; - $item_parent = $item['parent']; - $item_parent_uri = $item['parent-uri']; + $uri_id = $item['uri-id']; + $parent_uri_id = $item['parent-uri-id']; } } } @@ -240,15 +190,16 @@ function display_content(App $a, $update = false, $update_uid = 0) } if (!DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) { - DBA::update('notify', ['seen' => true], ['parent-uri-id' => $item['parent-uri-id'], 'uid' => local_user()]); + DI::notification()->setAllSeenForUser(local_user(), ['parent-uri-id' => $item['parent-uri-id']]); + DI::notify()->setAllSeenForUser(local_user(), ['parent-uri-id' => $item['parent-uri-id']]); } // We are displaying an "alternate" link if that post was public. See issue 2864 - $is_public = Post::exists(['id' => $item_id, 'private' => [Item::PUBLIC, Item::UNLISTED]]); + $is_public = Post::exists(['uri-id' => $uri_id, 'private' => [Item::PUBLIC, Item::UNLISTED]]); if ($is_public) { // For the atom feed the nickname doesn't matter at all, we only need the item id. - $alternate = DI::baseUrl().'/display/feed-item/'.$item_id.'.atom'; - $conversation = DI::baseUrl().'/display/feed-item/'.$item_parent.'/conversation.atom'; + $alternate = DI::baseUrl().'/display/feed-item/'.$uri_id.'.atom'; + $conversation = DI::baseUrl().'/display/feed-item/' . $parent_uri_id . '/conversation.atom'; } else { $alternate = ''; $conversation = ''; @@ -260,52 +211,41 @@ function display_content(App $a, $update = false, $update_uid = 0) $is_remote_contact = false; $item_uid = local_user(); + $page_uid = 0; $parent = null; - if (!empty($item_parent_uri)) { - $parent = Post::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]); + if (!local_user() && !empty($parent_uri_id)) { + $parent = Post::selectFirst(['uid'], ['uri-id' => $parent_uri_id, 'wall' => true]); } if (DBA::isResult($parent)) { - $a->profile['uid'] = ($a->profile['uid'] ?? 0) ?: $parent['uid']; - $is_remote_contact = Session::getRemoteContactID($a->profile['uid']); + $page_uid = $page_uid ?? 0 ?: $parent['uid']; + $is_remote_contact = Session::getRemoteContactID($page_uid); if ($is_remote_contact) { $item_uid = $parent['uid']; } } else { - $a->profile = ['uid' => intval($item['uid'])]; + $page_uid = $item['uid']; } - $page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]); - if (DBA::isResult($page_contact)) { - $a->page_contact = $page_contact; + if (!empty($page_uid) && ($page_uid != local_user())) { + $page_user = User::getById($page_uid); } - $is_owner = (local_user() && (in_array($a->profile['uid'], [local_user(), 0])) ? true : false); + $is_owner = local_user() && (in_array($page_uid, [local_user(), 0])); - if (!empty($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) { + if (!empty($page_user['hidewall']) && !$is_owner && !$is_remote_contact) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Access to this profile has been restricted.')); } // We need the editor here to be able to reshare an item. if ($is_owner && !$update) { - $x = [ - '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' => ACL::getFullSelectorHTML(DI::page(), $a->user, true), - 'bang' => '', - 'visitor' => 'block', - 'profile_uid' => local_user(), - ]; - $o .= status_editor($a, $x, 0, true); + $o .= DI::conversation()->statusEditor([], 0, true); } - $sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid']); + $sql_extra = Item::getPermissionsSQLByUserId($page_uid); - if (local_user() && (local_user() == $a->profile['uid'])) { - $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true]; + if (local_user() && (local_user() == $page_uid)) { + $condition = ['parent-uri-id' => $parent_uri_id, 'uid' => local_user(), 'unseen' => true]; $unseen = Post::exists($condition); } else { $unseen = false; @@ -315,35 +255,35 @@ function display_content(App $a, $update = false, $update_uid = 0) return ''; } - $condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, $item_uid]; - $fields = ['parent-uri', 'body', 'title', 'author-name', 'author-avatar', 'plink', 'author-id', 'owner-id', 'contact-id']; - $item = Item::selectFirstForUser($a->profile['uid'], $fields, $condition); + $condition = ["`uri-id` = ? AND `uid` IN (0, ?) " . $sql_extra, $uri_id, $item_uid]; + $fields = ['parent-uri-id', 'body', 'title', 'author-name', 'author-avatar', 'plink', 'author-id', 'owner-id', 'contact-id']; + $item = Post::selectFirstForUser($page_uid, $fields, $condition); if (!DBA::isResult($item)) { throw new HTTPException\NotFoundException(DI::l10n()->t('The requested item doesn\'t exist or has been deleted.')); } - $item['uri'] = $item['parent-uri']; + $item['uri-id'] = $item['parent-uri-id']; if ($unseen) { - $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true]; + $condition = ['parent-uri-id' => $parent_uri_id, 'uid' => local_user(), 'unseen' => true]; Item::update(['unseen' => false], $condition); } - if (!$update) { - $o .= ""; + if (!$update && local_user()) { + $o .= ""; } - $o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', $item_uid); + $o .= DI::conversation()->create([$item], 'display', $update_uid, false, 'commented', $item_uid); // Preparing the meta header - $description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true)); - $title = trim(HTML::toPlaintext(BBCode::convert($item["title"], false), 0, true)); - $author_name = $item["author-name"]; + $description = trim(BBCode::toPlaintext($item['body'])); + $title = trim(BBCode::toPlaintext($item['title'])); + $author_name = $item['author-name']; - $image = DI::baseUrl()->remove($item["author-avatar"]); + $image = DI::baseUrl()->remove($item['author-avatar']); - if ($title == "") { + if ($title == '') { $title = $author_name; } @@ -396,9 +336,9 @@ function display_content(App $a, $update = false, $update_uid = 0) return $o; } -function displayShowFeed($item_id, $conversation) +function displayShowFeed(int $uri_id, int $uid, bool $conversation) { - $xml = DFRN::itemFeed($item_id, $conversation); + $xml = DFRN::itemFeed($uri_id, $uid, $conversation); if ($xml == '') { throw new HTTPException\InternalServerErrorException(DI::l10n()->t('The feed for this item is unavailable.')); }