X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=d5db5d7e9b113a19b873ff736755ad0395694576;hb=86320317f493d0bf26fac7860d2e0c388633ab0c;hp=6723a77e9d106d269ce3a8f5d373f11633fc1553;hpb=854cc3e47296d4a1b01b893376064cf254d84f79;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
index 6723a77e9d..d5db5d7e9b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -13,13 +13,14 @@ 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;
+use Friendica\Network\HTTPException;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\DFRN;
use Friendica\Util\Strings;
@@ -30,26 +31,12 @@ function display_init(App $a)
Objects::rawContent();
}
- if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
+ if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
return;
}
$nick = (($a->argc > 1) ? $a->argv[1] : '');
- if ($a->argc == 3) {
- if (substr($a->argv[2], -5) == '.atom') {
- $item_id = substr($a->argv[2], 0, -5);
- displayShowFeed($item_id, false);
- }
- }
-
- if ($a->argc == 4) {
- if ($a->argv[3] == 'conversation.atom') {
- $item_id = $a->argv[2];
- displayShowFeed($item_id, true);
- }
- }
-
$item = null;
$item_user = local_user();
@@ -65,9 +52,11 @@ 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) && remote_user()) {
+ $item = Item::selectFirst($fields, ['guid' => $a->argv[1], 'private' => 1, 'origin' => true]);
if (DBA::isResult($item)) {
if (!Contact::isFollower(remote_user(), $item['uid'])) {
$item = null;
@@ -81,12 +70,20 @@ function display_init(App $a)
if (!DBA::isResult($item)) {
$item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => [0, 2], 'uid' => 0]);
}
- } elseif (($a->argc == 3) && ($nick == 'feed-item')) {
- $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => [0, 2], '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]);
}
if (!DBA::isResult($item)) {
- System::httpExit(404);
+ return;
+ }
+
+ if ($a->argc >= 3 && $nick == 'feed-item') {
+ displayShowFeed($item['id'], $a->argc > 3 && $a->argv[3] == 'conversation.atom');
}
if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
@@ -95,15 +92,16 @@ function display_init(App $a)
}
if ($item["id"] != $item["parent"]) {
- $item = Item::selectFirstForUser($item_user, $fields, ['id' => $item["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"])) {
+ 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",
@@ -135,51 +133,20 @@ function display_fetchauthor($a, $item)
$profiledata['network'] = $author['network'];
// Check for a repeated message
- $skip = false;
- $body = trim($item["body"]);
-
- // Skip if it isn't a pure repeated messages
- // Does it start with a share?
- if (!$skip && strpos($body, "[share") > 0) {
- $skip = true;
- }
- // Does it end with a share?
- if (!$skip && (strlen($body) > (strrpos($body, "[/share]") + 8))) {
- $skip = true;
- }
- if (!$skip) {
- $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
- // Skip if there is no shared message in there
- if ($body == $attributes) {
- $skip = true;
+ $shared = Item::getShareArray($item);
+ if (!empty($shared) && empty($shared['comment'])) {
+ if (!empty($shared['author'])) {
+ $profiledata['name'] = $shared['author'];
}
- }
- if (!$skip) {
- preg_match("/author='(.*?)'/ism", $attributes, $matches);
- if (!empty($matches[1])) {
- $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
- }
- preg_match('/author="(.*?)"/ism', $attributes, $matches);
- if (!empty($matches[1])) {
- $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
- }
- preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if (!empty($matches[1])) {
- $profiledata["url"] = $matches[1];
- }
- preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if (!empty($matches[1])) {
- $profiledata["url"] = $matches[1];
- }
- preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
- if (!empty($matches[1])) {
- $profiledata["photo"] = $matches[1];
+ if (!empty($shared['profile'])) {
+ $profiledata['url'] = $shared['profile'];
}
- preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
- if (!empty($matches[1])) {
- $profiledata["photo"] = $matches[1];
+
+ if (!empty($shared['avatar'])) {
+ $profiledata['photo'] = $shared['avatar'];
}
+
$profiledata["nickname"] = $profiledata["name"];
$profiledata["network"] = Protocol::matchByProfileUrl($profiledata["url"]);
@@ -189,29 +156,23 @@ function display_fetchauthor($a, $item)
$profiledata = Contact::getDetailsByURL($profiledata["url"], local_user(), $profiledata);
- $profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
-
- if (local_user()) {
- if (in_array($profiledata["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
- $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
- }
- } elseif ($profiledata["network"] == Protocol::DFRN) {
- $connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
- $profiledata["remoteconnect"] = $connect;
+ if (!empty($profiledata["photo"])) {
+ $profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]);
}
- return($profiledata);
+ return $profiledata;
}
function display_content(App $a, $update = false, $update_uid = 0)
{
- if (Config::get('system','block_public') && !local_user() && !remote_user()) {
- notice(L10n::t('Public access denied.') . EOL);
- return;
+ if (Config::get('system','block_public') && !Session::isAuthenticated()) {
+ throw new HTTPException\ForbiddenException(L10n::t('Public access denied.'));
}
$o = '';
+ $item = null;
+
if ($update) {
$item_id = $_REQUEST['item_id'];
$item = Item::selectFirst(['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
@@ -238,8 +199,10 @@ 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 (($item_parent == 0) && remote_user()) {
+ $item = Item::selectFirst($fields, ['guid' => $a->argv[1], 'private' => 1, 'origin' => true]);
if (DBA::isResult($item) && Contact::isFollower(remote_user(), $item['uid'])) {
$item_id = $item["id"];
$item_parent = $item["parent"];
@@ -259,58 +222,53 @@ function display_content(App $a, $update = false, $update_uid = 0)
}
}
- if (!$item_id) {
- System::httpExit(404);
+ if (empty($item)) {
+ throw new HTTPException\NotFoundException(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]]);
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 = '';
}
- $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('display-head.tpl'),
+ DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('display-head.tpl'),
['$alternate' => $alternate,
'$conversation' => $conversation]);
- $groups = [];
- $remote_cid = null;
$is_remote_contact = false;
$item_uid = local_user();
- if (isset($item_parent_uri)) {
+ $parent = null;
+ if (!empty($item_parent_uri)) {
$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 ($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'];
- }
- }
- }
}
+ 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']);
+ if ($is_remote_contact) {
+ $item_uid = $parent['uid'];
+ }
+ } else {
+ $a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
+ }
$page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]);
if (DBA::isResult($page_contact)) {
$a->page_contact = $page_contact;
}
+
$is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false);
if (!empty($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) {
- notice(L10n::t('Access to this profile has been restricted.') . EOL);
- return;
+ throw new HTTPException\ForbiddenException(L10n::t('Access to this profile has been restricted.'));
}
// We need the editor here to be able to reshare an item.
@@ -321,14 +279,14 @@ function display_content(App $a, $update = false, $update_uid = 0)
'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($a->user, true),
+ 'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true),
'bang' => '',
'visitor' => 'block',
'profile_uid' => local_user(),
];
$o .= status_editor($a, $x, 0, true);
}
- $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid'], $is_remote_contact, $groups, $remote_cid);
+ $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid']);
if (local_user() && (local_user() == $a->profile['profile_uid'])) {
$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
@@ -342,11 +300,11 @@ function display_content(App $a, $update = false, $update_uid = 0)
}
$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);
+ $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);
if (!DBA::isResult($item)) {
- System::httpExit(404);
+ throw new HTTPException\NotFoundException(L10n::t('The requested item doesn\'t exist or has been deleted.'));
}
$item['uri'] = $item['parent-uri'];
@@ -360,14 +318,14 @@ function display_content(App $a, $update = false, $update_uid = 0)
$o .= "";
}
- $o .= conversation($a, [$item], new Pager($a->query_string), 'display', $update_uid, false, 'commented', $item_uid);
+ $o .= conversation($a, [$item], new Pager(DI::args()->getQueryString()), '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"];
- $image = $a->removeBaseURL($item["author-avatar"]);
+ $image = DI::baseUrl()->remove($item["author-avatar"]);
if ($title == "") {
$title = $author_name;
@@ -382,36 +340,41 @@ function display_content(App $a, $update = false, $update_uid = 0)
$title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
$author_name = htmlspecialchars($author_name, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
- //
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ $page = DI::page();
+
+ if (DBA::exists('contact', ['unsearchable' => true, 'id' => [$item['contact-id'], $item['author-id'], $item['owner-id']]])) {
+ $page['htmlhead'] .= '' . "\n";
+ }
+
+ DI::page()['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
// Schema.org microdata
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
// Twitter cards
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
// Dublin Core
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
// Open Graph
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
// article:tag
return $o;
@@ -421,7 +384,7 @@ function displayShowFeed($item_id, $conversation)
{
$xml = DFRN::itemFeed($item_id, $conversation);
if ($xml == '') {
- System::httpExit(500);
+ throw new HTTPException\InternalServerErrorException(L10n::t('The feed for this item is unavailable.'));
}
header("Content-type: application/atom+xml");
echo $xml;