X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdisplay.php;h=2e931e0687e60b2d02189c33a1dd18303977c118;hb=8db9b0987eb6b2bf6f46efcb2a523be240246bdf;hp=d57b151bcf9b587077b4b1c27345178ff2c9e331;hpb=cfa68c52b9117616fa95a4639ad74e7d220d193d;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
index d57b151bcf..2e931e0687 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -4,28 +4,37 @@
*/
use Friendica\App;
+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\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\Profile;
+use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\DFRN;
+use Friendica\Util\Strings;
+use Friendica\Module\Objects;
function display_init(App $a)
{
+ if (ActivityPub::isRequest()) {
+ Objects::rawContent();
+ }
+
if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
return;
}
$nick = (($a->argc > 1) ? $a->argv[1] : '');
- $profiledata = [];
if ($a->argc == 3) {
if (substr($a->argv[2], -5) == '.atom') {
@@ -42,8 +51,9 @@ function display_init(App $a)
}
$item = null;
+ $item_user = local_user();
- $fields = ['id', 'parent', 'author-id', 'body', 'uid'];
+ $fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid'];
// If there is only one parameter, then check if this parameter could be a guid
if ($a->argc == 2) {
@@ -55,6 +65,16 @@ function display_init(App $a)
if (DBA::isResult($item)) {
$nick = $a->user["nickname"];
}
+ // Is this item private but could be visible to the remove visitor?
+ } elseif (remote_user()) {
+ $item = Item::selectFirst($fields, ['guid' => $a->argv[1], 'private' => 1]);
+ if (DBA::isResult($item)) {
+ if (!Contact::isFollower(remote_user(), $item['uid'])) {
+ $item = null;
+ } else {
+ $item_user = $item['uid'];
+ }
+ }
}
// Is it an item with uid=0?
@@ -66,24 +86,22 @@ function display_init(App $a)
}
if (!DBA::isResult($item)) {
- $a->error = 404;
- notice(L10n::t('Item not found.') . EOL);
- return;
+ System::httpExit(404);
}
if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
- logger('Directly serving XML for id '.$item["id"], LOGGER_DEBUG);
+ Logger::log('Directly serving XML for id '.$item["id"], Logger::DEBUG);
displayShowFeed($item["id"], false);
}
if ($item["id"] != $item["parent"]) {
- $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]);
+ $item = Item::selectFirstForUser($item_user, $fields, ['id' => $item["parent"]]);
}
$profiledata = display_fetchauthor($a, $item);
- if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) {
- $nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"]));
+ if (strstr(Strings::normaliseLink($profiledata["url"]), Strings::normaliseLink(System::baseUrl()))) {
+ $nickname = str_replace(Strings::normaliseLink(System::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`
@@ -94,7 +112,7 @@ function display_init(App $a)
if (DBA::isResult($profile)) {
$profiledata = $profile;
}
- $profiledata["network"] = NETWORK_DFRN;
+ $profiledata["network"] = Protocol::DFRN;
} else {
$profiledata = [];
}
@@ -138,7 +156,6 @@ function display_fetchauthor($a, $item)
}
if (!$skip) {
- $author = "";
preg_match("/author='(.*?)'/ism", $attributes, $matches);
if (!empty($matches[1])) {
$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
@@ -147,7 +164,6 @@ function display_fetchauthor($a, $item)
if (!empty($matches[1])) {
$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
}
- $profile = "";
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
if (!empty($matches[1])) {
$profiledata["url"] = $matches[1];
@@ -156,7 +172,6 @@ function display_fetchauthor($a, $item)
if (!empty($matches[1])) {
$profiledata["url"] = $matches[1];
}
- $avatar = "";
preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
if (!empty($matches[1])) {
$profiledata["photo"] = $matches[1];
@@ -177,10 +192,10 @@ function display_fetchauthor($a, $item)
$profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
if (local_user()) {
- if (in_array($profiledata["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
+ if (in_array($profiledata["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
$profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
}
- } elseif ($profiledata["network"] == NETWORK_DFRN) {
+ } elseif ($profiledata["network"] == Protocol::DFRN) {
$connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
$profiledata["remoteconnect"] = $connect;
}
@@ -195,9 +210,6 @@ function display_content(App $a, $update = false, $update_uid = 0)
return;
}
- require_once 'include/security.php';
- require_once 'include/conversation.php';
-
$o = '';
if ($update) {
@@ -216,7 +228,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
if ($a->argc == 2) {
$item_parent = 0;
- $fields = ['id', 'parent', 'parent-uri'];
+ $fields = ['id', 'parent', 'parent-uri', 'uid'];
if (local_user()) {
$condition = ['guid' => $a->argv[1], 'uid' => local_user()];
@@ -226,6 +238,13 @@ function display_content(App $a, $update = false, $update_uid = 0)
$item_parent = $item["parent"];
$item_parent_uri = $item['parent-uri'];
}
+ } elseif (remote_user()) {
+ $item = Item::selectFirst($fields, ['guid' => $a->argv[1], 'private' => 1]);
+ if (DBA::isResult($item) && Contact::isFollower(remote_user(), $item['uid'])) {
+ $item_id = $item["id"];
+ $item_parent = $item["parent"];
+ $item_parent_uri = $item['parent-uri'];
+ }
}
if ($item_parent == 0) {
@@ -241,13 +260,11 @@ function display_content(App $a, $update = false, $update_uid = 0)
}
if (!$item_id) {
- $a->error = 404;
- notice(L10n::t('Item not found.').EOL);
- return;
+ System::httpExit(404);
}
// We are displaying an "alternate" link if that post was public. See issue 2864
- $is_public = DBA::exists('item', ['id' => $item_id, 'private' => [0, 2]]);
+ $is_public = Item::exists(['id' => $item_id, 'private' => [0, 2]]);
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';
@@ -257,39 +274,28 @@ function display_content(App $a, $update = false, $update_uid = 0)
$conversation = '';
}
- $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'),
+ $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('display-head.tpl'),
['$alternate' => $alternate,
'$conversation' => $conversation]);
$groups = [];
-
- $contact = null;
+ $remote_cid = null;
$is_remote_contact = false;
+ $item_uid = local_user();
- $contact_id = 0;
-
- if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
- foreach ($_SESSION['remote'] as $v) {
- if ($v['uid'] == $a->profile['uid']) {
- $contact_id = $v['cid'];
- break;
- }
- }
+ $parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
+ if (DBA::isResult($parent)) {
+ $a->profile['uid'] = defaults($a->profile, 'uid', $parent['uid']);
+ $a->profile['profile_uid'] = defaults($a->profile, 'profile_uid', $parent['uid']);
+ $is_remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']);
}
- if ($contact_id) {
- $groups = Group::getIdsByContactId($contact_id);
- $remote_contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => $a->profile['uid']]);
- if (DBA::isResult($remote_contact)) {
- $contact = $remote_contact;
- $is_remote_contact = true;
- }
- }
-
- if (!$is_remote_contact) {
- if (local_user()) {
- $contact_id = $_SESSION['cid'];
- $contact = $a->contact;
+ if ($is_remote_contact) {
+ $cdata = Contact::getPublicAndUserContacID(remote_user(), $a->profile['profile_uid']);
+ if (!empty($cdata['user'])) {
+ $groups = Group::getIdsByContactId($cdata['user']);
+ $remote_cid = $cdata['user'];
+ $item_uid = $parent['uid'];
}
}
@@ -299,7 +305,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
}
$is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false);
- if (x($a->profile, 'hidewall') && !$is_owner && !$is_remote_contact) {
+ if (!empty($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) {
notice(L10n::t('Access to this profile has been restricted.') . EOL);
return;
}
@@ -319,12 +325,11 @@ 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'], $is_remote_contact, $groups, $remote_cid);
- $sql_extra = item_permissions_sql($a->profile['uid'], $is_remote_contact, $groups);
-
- if (local_user() && (local_user() == $a->profile['uid'])) {
+ if (local_user() && (local_user() == $a->profile['profile_uid'])) {
$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
- $unseen = DBA::exists('item', $condition);
+ $unseen = Item::exists($condition);
} else {
$unseen = false;
}
@@ -333,35 +338,33 @@ function display_content(App $a, $update = false, $update_uid = 0)
return '';
}
- $condition = ["`item`.`parent-uri` = (SELECT `parent-uri` FROM `item` WHERE `id` = ?)
- AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, local_user()];
- $params = ['order' => ['uid', 'parent' => true, 'gravity', 'id']];
- $items_obj = Item::selectForUser(local_user(), [], $condition, $params);
+ $condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, $item_uid];
+ $fields = ['parent-uri', 'body', 'title', 'author-name', 'author-avatar', 'plink'];
+ $item = Item::selectFirstForUser(local_user(), $fields, $condition);
- if (!DBA::isResult($items_obj)) {
- notice(L10n::t('Item not found.') . EOL);
- return $o;
+ if (!DBA::isResult($item)) {
+ System::httpExit(404);
}
+ $item['uri'] = $item['parent-uri'];
+
if ($unseen) {
$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
Item::update(['unseen' => false], $condition);
}
- $items = Item::inArray($items_obj);
- $conversation_items = conv_sort($items, "`commented`");
-
if (!$update) {
$o .= "";
}
- $o .= conversation($a, $conversation_items, 'display', $update_uid, false, 'commented', local_user());
+
+ $o .= conversation($a, [$item], new Pager($a->query_string), 'display', $update_uid, false, 'commented', $item_uid);
// Preparing the meta header
- $description = trim(HTML::toPlaintext(BBCode::convert($items[0]["body"], false), 0, true));
- $title = trim(HTML::toPlaintext(BBCode::convert($items[0]["title"], false), 0, true));
- $author_name = $items[0]["author-name"];
+ $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"];
- $image = $a->remove_baseurl($items[0]["author-avatar"]);
+ $image = $a->removeBaseURL($item["author-avatar"]);
if ($title == "") {
$title = $author_name;
@@ -393,7 +396,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
$a->page['htmlhead'] .= ''."\n";
$a->page['htmlhead'] .= ''."\n";
$a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ $a->page['htmlhead'] .= ''."\n";
// Dublin Core
$a->page['htmlhead'] .= ''."\n";
@@ -403,7 +406,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
$a->page['htmlhead'] .= ''."\n";
$a->page['htmlhead'] .= ''."\n";
$a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ $a->page['htmlhead'] .= ''."\n";
$a->page['htmlhead'] .= ''."\n";
$a->page['htmlhead'] .= ''."\n";
// article:tag
@@ -419,5 +422,5 @@ function displayShowFeed($item_id, $conversation)
}
header("Content-type: application/atom+xml");
echo $xml;
- killme();
+ exit();
}