X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=02e838f55d42ee6cc817458ef450540c7a367237;hb=13a4483c59d916b48f9585beb7f5a71328055b72;hp=f4274caeaeb20eca05327812aafa32cfc392ed4e;hpb=6d7362da4134cce31f28a5efa2c623a11f89afc2;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
index f4274caeae..02e838f55d 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,6 +1,22 @@
.
+ *
*/
use Friendica\App;
@@ -8,17 +24,13 @@ use Friendica\Content\Pager;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\ACL;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
-use Friendica\Core\System;
use Friendica\Core\Session;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
-use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\Profile;
use Friendica\Module\Objects;
@@ -30,10 +42,10 @@ use Friendica\Util\Strings;
function display_init(App $a)
{
if (ActivityPub::isRequest()) {
- Objects::rawContent();
+ Objects::rawContent(['guid' => $a->argv[1] ?? null]);
}
- if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
+ if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
return;
}
@@ -42,7 +54,7 @@ function display_init(App $a)
$item = null;
$item_user = local_user();
- $fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid'];
+ $fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid', 'gravity'];
// If there is only one parameter, then check if this parameter could be a guid
if ($a->argc == 2) {
@@ -58,7 +70,7 @@ function display_init(App $a)
// Is this item private but could be visible to the remove visitor?
if (!DBA::isResult($item) && remote_user()) {
- $item = Item::selectFirst($fields, ['guid' => $a->argv[1], 'private' => 1, 'origin' => true]);
+ $item = Item::selectFirst($fields, ['guid' => $a->argv[1], 'private' => Item::PRIVATE, 'origin' => true]);
if (DBA::isResult($item)) {
if (!Contact::isFollower(remote_user(), $item['uid'])) {
$item = null;
@@ -70,14 +82,14 @@ 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' => [0, 2], 'uid' => 0]);
+ $item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[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);
}
- $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item_id, 'private' => [0, 2], 'uid' => 0]);
+ $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item_id, 'private' => [Item::PUBLIC, Item::UNLISTED], 'uid' => 0]);
}
if (!DBA::isResult($item)) {
@@ -89,26 +101,22 @@ function display_init(App $a)
}
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::log('Directly serving XML for id '.$item['id'], Logger::DEBUG);
+ displayShowFeed($item['id'], false);
}
- if ($item["id"] != $item["parent"]) {
- $parent = Item::selectFirstForUser($item_user, $fields, ['id' => $item["parent"]]);
+ if ($item['gravity'] != GRAVITY_PARENT) {
+ $parent = Item::selectFirstForUser($item_user, $fields, ['id' => $item['parent']]);
$item = $parent ?: $item;
}
$profiledata = display_fetchauthor($a, $item);
- if (strstr(Strings::normaliseLink($profiledata["url"]), Strings::normaliseLink(System::baseUrl()))) {
- $nickname = str_replace(Strings::normaliseLink(System::baseUrl())."/profile/", "", Strings::normaliseLink($profiledata["url"]));
+ if (strstr(Strings::normaliseLink($profiledata['url']), Strings::normaliseLink(DI::baseUrl()))) {
+ $nickname = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/profile/', '', Strings::normaliseLink($profiledata['url']));
- if ($nickname != $a->user["nickname"]) {
- $profile = DBA::fetchFirst("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
- INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
- WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
- $nickname
- );
+ if (!empty($a->user['nickname']) && $nickname != $a->user['nickname']) {
+ $profile = DBA::selectFirst('owner-view', [], ['nickname' => $nickname]);
if (DBA::isResult($profile)) {
$profiledata = $profile;
}
@@ -118,7 +126,7 @@ function display_init(App $a)
}
}
- Profile::load($a, $nick, 0, $profiledata);
+ Profile::load($a, $nick, $profiledata);
}
function display_fetchauthor($a, $item)
@@ -159,7 +167,7 @@ function display_fetchauthor($a, $item)
$profiledata = Contact::getDetailsByURL($profiledata["url"], local_user(), $profiledata);
if (!empty($profiledata["photo"])) {
- $profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
+ $profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]);
}
return $profiledata;
@@ -167,21 +175,23 @@ function display_fetchauthor($a, $item)
function display_content(App $a, $update = false, $update_uid = 0)
{
- if (Config::get('system','block_public') && !Session::isAuthenticated()) {
- throw new HTTPException\ForbiddenException(L10n::t('Public access denied.'));
+ if (DI::config()->get('system','block_public') && !Session::isAuthenticated()) {
+ throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
}
$o = '';
$item = null;
+ $force = (bool)($_REQUEST['force'] ?? false);
+
if ($update) {
$item_id = $_REQUEST['item_id'];
$item = Item::selectFirst(['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
if ($item['uid'] != 0) {
- $a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
+ $a->profile = ['uid' => intval($item['uid'])];
} else {
- $a->profile = ['uid' => intval($update_uid), 'profile_uid' => intval($update_uid)];
+ $a->profile = ['uid' => intval($update_uid)];
}
$item_parent = $item['parent'];
$item_parent_uri = $item['parent-uri'];
@@ -197,27 +207,27 @@ function display_content(App $a, $update = false, $update_uid = 0)
$condition = ['guid' => $a->argv[1], 'uid' => local_user()];
$item = Item::selectFirstForUser(local_user(), $fields, $condition);
if (DBA::isResult($item)) {
- $item_id = $item["id"];
- $item_parent = $item["parent"];
+ $item_id = $item['id'];
+ $item_parent = $item['parent'];
$item_parent_uri = $item['parent-uri'];
}
}
if (($item_parent == 0) && remote_user()) {
- $item = Item::selectFirst($fields, ['guid' => $a->argv[1], 'private' => 1, 'origin' => true]);
+ $item = Item::selectFirst($fields, ['guid' => $a->argv[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_id = $item['id'];
+ $item_parent = $item['parent'];
$item_parent_uri = $item['parent-uri'];
}
}
if ($item_parent == 0) {
- $condition = ['private' => [0, 2], 'guid' => $a->argv[1], 'uid' => 0];
+ $condition = ['private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $a->argv[1], 'uid' => 0];
$item = Item::selectFirstForUser(local_user(), $fields, $condition);
if (DBA::isResult($item)) {
- $item_id = $item["id"];
- $item_parent = $item["parent"];
+ $item_id = $item['id'];
+ $item_parent = $item['parent'];
$item_parent_uri = $item['parent-uri'];
}
}
@@ -225,15 +235,15 @@ function display_content(App $a, $update = false, $update_uid = 0)
}
if (empty($item)) {
- throw new HTTPException\NotFoundException(L10n::t('The requested item doesn\'t exist or has been deleted.'));
+ throw new HTTPException\NotFoundException(DI::l10n()->t('The requested item doesn\'t exist or has been deleted.'));
}
// We are displaying an "alternate" link if that post was public. See issue 2864
- $is_public = Item::exists(['id' => $item_id, 'private' => [0, 2]]);
+ $is_public = Item::exists(['id' => $item_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 = System::baseUrl().'/display/feed-item/'.$item_id.'.atom';
- $conversation = System::baseUrl().'/display/feed-item/'.$item_parent.'/conversation.atom';
+ $alternate = DI::baseUrl().'/display/feed-item/'.$item_id.'.atom';
+ $conversation = DI::baseUrl().'/display/feed-item/'.$item_parent.'/conversation.atom';
} else {
$alternate = '';
$conversation = '';
@@ -253,13 +263,12 @@ function display_content(App $a, $update = false, $update_uid = 0)
if (DBA::isResult($parent)) {
$a->profile['uid'] = ($a->profile['uid'] ?? 0) ?: $parent['uid'];
- $a->profile['profile_uid'] = ($a->profile['profile_uid'] ?? 0) ?: $parent['uid'];
- $is_remote_contact = Session::getRemoteContactID($a->profile['profile_uid']);
+ $is_remote_contact = Session::getRemoteContactID($a->profile['uid']);
if ($is_remote_contact) {
$item_uid = $parent['uid'];
}
} else {
- $a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
+ $a->profile = ['uid' => intval($item['uid'])];
}
$page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]);
@@ -267,14 +276,14 @@ function display_content(App $a, $update = false, $update_uid = 0)
$a->page_contact = $page_contact;
}
- $is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false);
+ $is_owner = (local_user() && (in_array($a->profile['uid'], [local_user(), 0])) ? true : false);
if (!empty($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) {
- throw new HTTPException\ForbiddenException(L10n::t('Access to this profile has been restricted.'));
+ 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) {
+ if ($is_owner && !$update) {
$x = [
'is_owner' => true,
'allow_location' => $a->user['allow_location'],
@@ -288,25 +297,25 @@ function display_content(App $a, $update = false, $update_uid = 0)
];
$o .= status_editor($a, $x, 0, true);
}
- $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid']);
+ $sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid']);
- if (local_user() && (local_user() == $a->profile['profile_uid'])) {
+ if (local_user() && (local_user() == $a->profile['uid'])) {
$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
$unseen = Item::exists($condition);
} else {
$unseen = false;
}
- if ($update && !$unseen) {
+ if ($update && !$unseen && !$force) {
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['profile_uid'], $fields, $condition);
+ $item = Item::selectFirstForUser($a->profile['uid'], $fields, $condition);
if (!DBA::isResult($item)) {
- throw new HTTPException\NotFoundException(L10n::t('The requested item doesn\'t exist or has been deleted.'));
+ throw new HTTPException\NotFoundException(DI::l10n()->t('The requested item doesn\'t exist or has been deleted.'));
}
$item['uri'] = $item['parent-uri'];
@@ -317,10 +326,10 @@ function display_content(App $a, $update = false, $update_uid = 0)
}
if (!$update) {
- $o .= "";
+ $o .= "";
}
- $o .= conversation($a, [$item], new Pager(DI::args()->getQueryString()), 'display', $update_uid, false, 'commented', $item_uid);
+ $o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', $item_uid);
// Preparing the meta header
$description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true));
@@ -363,7 +372,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
$page['htmlhead'] .= ''."\n";
$page['htmlhead'] .= ''."\n";
$page['htmlhead'] .= ''."\n";
- $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
$page['htmlhead'] .= ''."\n";
// Dublin Core
@@ -373,7 +382,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
// Open Graph
$page['htmlhead'] .= ''."\n";
$page['htmlhead'] .= ''."\n";
- $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
$page['htmlhead'] .= ''."\n";
$page['htmlhead'] .= ''."\n";
$page['htmlhead'] .= ''."\n";
@@ -386,7 +395,7 @@ function displayShowFeed($item_id, $conversation)
{
$xml = DFRN::itemFeed($item_id, $conversation);
if ($xml == '') {
- throw new HTTPException\InternalServerErrorException(L10n::t('The feed for this item is unavailable.'));
+ throw new HTTPException\InternalServerErrorException(DI::l10n()->t('The feed for this item is unavailable.'));
}
header("Content-type: application/atom+xml");
echo $xml;