X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=8be5520138199719fd682c996808608c8dd9f041;hb=df61be84fc3865f14c6ed84f0d20d86b2ad1f6e8;hp=ff1ae6741b0746a0c6df9839403c7b035b40128b;hpb=4714cb746b6fb8e7bc4ae9676866c9da37af75af;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
index ff1ae6741b..8be5520138 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -4,98 +4,111 @@
*/
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\System;
-use Friendica\Database\DBM;
+use Friendica\Core\Renderer;
+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;
function display_init(App $a)
{
- if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
- return;
+ if (ActivityPub::isRequest()) {
+ Objects::rawContent();
}
- $nick = (($a->argc > 1) ? $a->argv[1] : '');
- $profiledata = [];
-
- if ($a->argc == 3) {
- if (substr($a->argv[2], -5) == '.atom') {
- $item_id = substr($a->argv[2], 0, -5);
- displayShowFeed($item_id, false);
- }
+ if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
+ return;
}
- if ($a->argc == 4) {
- if ($a->argv[3] == 'conversation.atom') {
- $item_id = $a->argv[2];
- displayShowFeed($item_id, true);
- }
- }
+ $nick = (($a->argc > 1) ? $a->argv[1] : '');
- $r = false;
+ $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) {
$nick = "";
- $r = false;
// Does the local user have this item?
if (local_user()) {
- $r = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]);
- if (DBM::is_result($r)) {
+ $item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]);
+ if (DBA::isResult($item)) {
$nick = $a->user["nickname"];
}
}
+ // 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]);
+ 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?
- if (!DBM::is_result($r)) {
- $r = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => false, 'uid' => 0]);
+ 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_id = $a->argv[2];
+ if (substr($item_id, -5) == '.atom') {
+ $item_id = substr($item_id, 0, -5);
}
- } elseif (($a->argc == 3) && ($nick == 'feed-item')) {
- $r = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => false, 'uid' => 0]);
+ $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item_id, 'private' => [0, 2], 'uid' => 0]);
}
- if (!DBM::is_result($r) || $r['deleted']) {
- $a->error = 404;
- notice(L10n::t('Item not found.') . EOL);
+ if (!DBA::isResult($item)) {
return;
}
- if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
- logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG);
- displayShowFeed($r["id"], false);
+ if ($a->argc >= 3 && $nick == 'feed-item') {
+ displayShowFeed($item['id'], $a->argc > 3 && $a->argv[3] == 'conversation.atom');
}
- if ($r["id"] != $r["parent"]) {
- $r = Item::selectFirstForUser(local_user(), $fields, ['id' => $r["parent"]]);
+ 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);
}
- $profiledata = display_fetchauthor($a, $r);
+ if ($item["id"] != $item["parent"]) {
+ $parent = Item::selectFirstForUser($item_user, $fields, ['id' => $item["parent"]]);
+ $item = $parent ?: $item;
+ }
+
+ $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(DI::baseUrl()))) {
+ $nickname = str_replace(Strings::normaliseLink(DI::baseUrl())."/profile/", "", Strings::normaliseLink($profiledata["url"]));
- if (($nickname != $a->user["nickname"])) {
- $r = dba::fetch_first("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+ if ($nickname != $a->user["nickname"]) {
+ $profile = DBA::fetchFirst("SELECT `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",
+ WHERE `user`.`nickname` = ? AND `contact`.`self` LIMIT 1",
$nickname
);
- if (DBM::is_result($r)) {
- $profiledata = $r;
+ if (DBA::isResult($profile)) {
+ $profiledata = $profile;
}
- $profiledata["network"] = NETWORK_DFRN;
+ $profiledata["network"] = Protocol::DFRN;
} else {
$profiledata = [];
}
@@ -104,8 +117,9 @@ function display_init(App $a)
Profile::load($a, $nick, 0, $profiledata);
}
-function display_fetchauthor($a, $item) {
- $author = dba::selectFirst('contact', ['name', 'nick', 'photo', 'network', 'url'], ['id' => $item['author-id']]);
+function display_fetchauthor($a, $item)
+{
+ $author = DBA::selectFirst('contact', ['name', 'nick', 'photo', 'network', 'url'], ['id' => $item['author-id']]);
$profiledata = [];
$profiledata['uid'] = -1;
@@ -117,54 +131,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) {
- $author = "";
- preg_match("/author='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
- $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
+ if (!empty($shared['profile'])) {
+ $profiledata['url'] = $shared['profile'];
}
- preg_match('/author="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
- $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
- }
- $profile = "";
- preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
- $profiledata["url"] = $matches[1];
- }
- preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
- $profiledata["url"] = $matches[1];
- }
- $avatar = "";
- preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
- $profiledata["photo"] = $matches[1];
- }
- preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
- $profiledata["photo"] = $matches[1];
+
+ if (!empty($shared['avatar'])) {
+ $profiledata['photo'] = $shared['avatar'];
}
+
$profiledata["nickname"] = $profiledata["name"];
$profiledata["network"] = Protocol::matchByProfileUrl($profiledata["url"]);
@@ -174,137 +154,118 @@ 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"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
- $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
- }
- } elseif ($profiledata["network"] == NETWORK_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;
+function display_content(App $a, $update = false, $update_uid = 0)
+{
+ if (DI::config()->get('system','block_public') && !Session::isAuthenticated()) {
+ throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
}
- require_once 'include/security.php';
- require_once 'include/conversation.php';
-
$o = '';
+ $item = null;
+
if ($update) {
$item_id = $_REQUEST['item_id'];
- $item = dba::selectFirst('item', ['uid', 'parent', 'parent-uri'], ['id' => $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'];
} else {
$item_id = (($a->argc > 2) ? $a->argv[2] : 0);
+ $item_parent = $item_id;
if ($a->argc == 2) {
$item_parent = 0;
+ $fields = ['id', 'parent', 'parent-uri', 'uid'];
if (local_user()) {
- $r = dba::fetch_first("SELECT `id`, `parent`, `parent-uri` FROM `item`
- WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
- AND `guid` = ? AND `uid` = ?", $a->argv[1], local_user());
- if (DBM::is_result($r)) {
- $item_id = $r["id"];
- $item_parent = $r["parent"];
- $item_parent_uri = $r['parent-uri'];
+ $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_parent_uri = $item['parent-uri'];
+ }
+ }
+
+ 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"];
+ $item_parent_uri = $item['parent-uri'];
}
}
if ($item_parent == 0) {
- $r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`parent-uri` FROM `item`
- WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
- AND NOT `item`.`private` AND `item`.`uid` = 0
- AND `item`.`guid` = ?", $a->argv[1]);
- if (DBM::is_result($r)) {
- $item_id = $r["id"];
- $item_parent = $r["parent"];
- $item_parent_uri = $r['parent-uri'];
+ $condition = ['private' => [0, 2], '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_parent_uri = $item['parent-uri'];
}
}
}
}
- if (!$item_id) {
- $a->error = 404;
- notice(L10n::t('Item not found.').EOL);
- return;
+ if (empty($item)) {
+ 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 = dba::exists('item', ['id' => $item_id, 'private' => false]);
+ $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'] .= replace_macros(get_markup_template('display-head.tpl'),
+ DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('display-head.tpl'),
['$alternate' => $alternate,
'$conversation' => $conversation]);
- $groups = [];
+ $is_remote_contact = false;
+ $item_uid = local_user();
- $contact = null;
- $remote_contact = false;
-
- $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 = null;
+ if (!empty($item_parent_uri)) {
+ $parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
}
- if ($contact_id) {
- $groups = Group::getIdsByContactId($contact_id);
- $r = dba::fetch_first("SELECT * FROM `contact` WHERE `id` = ? AND `uid` = ? LIMIT 1",
- $contact_id,
- $a->profile['uid']
- );
- if (DBM::is_result($r)) {
- $contact = $r;
- $remote_contact = true;
+ if (DBA::isResult($parent)) {
+ $a->profile['uid'] = ($a->profile['uid'] ?? 0) ?: $parent['uid'];
+ $is_remote_contact = Session::getRemoteContactID($a->profile['uid']);
+ if ($is_remote_contact) {
+ $item_uid = $parent['uid'];
}
+ } else {
+ $a->profile = ['uid' => intval($item['uid'])];
}
- if (!$remote_contact) {
- if (local_user()) {
- $contact_id = $_SESSION['cid'];
- $contact = $a->contact;
- }
+ $page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]);
+ if (DBA::isResult($page_contact)) {
+ $a->page_contact = $page_contact;
}
- $r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $a->profile['uid']);
- if (DBM::is_result($r)) {
- $a->page_contact = $r;
- }
- $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 (x($a->profile, 'hidewall') && !$is_owner && !$remote_contact) {
- notice(L10n::t('Access to this profile has been restricted.') . EOL);
- return;
+ if (!empty($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) {
+ 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.
@@ -315,19 +276,18 @@ 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_permissions_sql($a->profile['uid'], $remote_contact, $groups);
+ $sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid']);
if (local_user() && (local_user() == $a->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;
}
@@ -336,36 +296,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']];
- $r = 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', 'author-id', 'owner-id', 'contact-id'];
+ $item = Item::selectFirstForUser($a->profile['uid'], $fields, $condition);
- if (!DBM::is_result($r)) {
- notice(L10n::t('Item not found.') . EOL);
- return $o;
+ if (!DBA::isResult($item)) {
+ throw new HTTPException\NotFoundException(DI::l10n()->t('The requested item doesn\'t exist or has been deleted.'));
}
- $s = dba::inArray($r);
+ $item['uri'] = $item['parent-uri'];
if ($unseen) {
$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
Item::update(['unseen' => false], $condition);
}
- $items = conv_sort($s, "`commented`");
-
if (!$update) {
- $o .= "";
+ $o .= "";
}
- $o .= conversation($a, $items, 'display', $update_uid, false, 'commented', local_user());
+
+ $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($s[0]["body"], false), 0, true));
- $title = trim(HTML::toPlaintext(BBCode::convert($s[0]["title"], false), 0, true));
- $author_name = $s[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($s[0]["author-thumb"]);
+ $image = DI::baseUrl()->remove($item["author-avatar"]);
if ($title == "") {
$title = $author_name;
@@ -380,47 +337,53 @@ 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;
}
-function displayShowFeed($item_id, $conversation) {
+function displayShowFeed($item_id, $conversation)
+{
$xml = DFRN::itemFeed($item_id, $conversation);
if ($xml == '') {
- System::httpExit(500);
+ throw new HTTPException\InternalServerErrorException(DI::l10n()->t('The feed for this item is unavailable.'));
}
header("Content-type: application/atom+xml");
echo $xml;
- killme();
+ exit();
}