X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=ba339b918519cea5018db041f628e0934fecb56a;hb=f4c94236c5ffea5ddd369b073aeec44320a137df;hp=6723a77e9d106d269ce3a8f5d373f11633fc1553;hpb=4aa28de89ec9dd0e27b37dbde9b8758c5bb6c4b4;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
index 6723a77e9d..ba339b9185 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -14,12 +14,14 @@ 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\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 +32,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 +53,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 +71,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')) {
@@ -103,7 +101,7 @@ function display_init(App $a)
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"])) {
+ 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');
+ if (!empty($shared['profile'])) {
+ $profiledata['url'] = $shared['profile'];
}
- 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];
- }
- 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,25 +156,17 @@ 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"] = System::removedBaseUrl($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 = '';
@@ -238,8 +197,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"];
@@ -260,7 +221,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
}
if (!$item_id) {
- System::httpExit(404);
+ 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
@@ -278,39 +239,30 @@ function display_content(App $a, $update = false, $update_uid = 0)
['$alternate' => $alternate,
'$conversation' => $conversation]);
- $groups = [];
- $remote_cid = null;
$is_remote_contact = false;
$item_uid = local_user();
if (isset($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']);
-
+ $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) {
- $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'];
- }
+ $item_uid = $parent['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 +273,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($a->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 +294,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'];
@@ -382,7 +334,10 @@ 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
- //
+ if (DBA::exists('contact', ['unsearchable' => true, 'id' => [$item['contact-id'], $item['author-id'], $item['owner-id']]])) {
+ $a->page['htmlhead'] .= '' . "\n";
+ }
+
$a->page['htmlhead'] .= ''."\n";
$a->page['htmlhead'] .= ''."\n";
$a->page['htmlhead'] .= ''."\n";
@@ -421,7 +376,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;