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;
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();
if (DBA::isResult($item)) {
$nick = $a->user["nickname"];
}
+ }
+
// Is this item private but could be visible to the remove visitor?
- } elseif (remote_user()) {
+ if (!DBA::isResult($item) && remote_user()) {
$item = Item::selectFirst($fields, ['guid' => $a->argv[1], 'private' => 1]);
if (DBA::isResult($item)) {
if (!Contact::isFollower(remote_user(), $item['uid'])) {
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')) {
$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 = '';
$item_parent = $item["parent"];
$item_parent_uri = $item['parent-uri'];
}
- } elseif (remote_user()) {
+ }
+
+ if (($item_parent == 0) && 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"];
}
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
['$alternate' => $alternate,
'$conversation' => $conversation]);
- $groups = [];
- $remote_cid = null;
$is_remote_contact = false;
$item_uid = local_user();
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']);
-
+ $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'];
}
}
}
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.
];
$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];
}
$condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, $item_uid];
- $fields = ['parent-uri', 'body', 'title', 'author-name', 'author-avatar', 'plink'];
+ $fields = ['parent-uri', 'body', 'title', 'author-name', 'author-avatar', 'plink', 'author-id', 'owner-id', 'contact-id'];
$item = Item::selectFirstForUser(local_user(), $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'];
$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
- //<meta name="keywords" content="">
+ if (DBA::exists('contact', ['unsearchable' => true, 'id' => [$item['contact-id'], $item['author-id'], $item['owner-id']]])) {
+ $a->page['htmlhead'] .= '<meta content="noindex, noarchive" name="robots" />' . "\n";
+ }
+
$a->page['htmlhead'] .= '<meta name="author" content="'.$author_name.'" />'."\n";
$a->page['htmlhead'] .= '<meta name="title" content="'.$title.'" />'."\n";
$a->page['htmlhead'] .= '<meta name="fulltitle" content="'.$title.'" />'."\n";
{
$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;
projects / friendica.git / blobdiff