<?php
use Friendica\App;
+use Friendica\Core\System;
require_once('include/dfrn.php');
if ($a->argc == 3) {
if (substr($a->argv[2], -5) == '.atom') {
$item_id = substr($a->argv[2], 0, -5);
- $xml = dfrn::itemFeed($item_id);
- if ($xml == '') {
- http_status_exit(500);
- }
- header("Content-type: application/atom+xml");
- echo $xml;
- killme();
+ displayShowFeed($item_id, false);
+ }
+ }
+
+ if ($a->argc == 4) {
+ if ($a->argv[3] == 'conversation.atom') {
+ $item_id = $a->argv[2];
+ displayShowFeed($item_id, true);
}
}
if ($a->argc == 2) {
$nick = "";
$itemuid = 0;
+ $r = false;
// Does the local user have this item?
if (local_user()) {
- $r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
- WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
+ $r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
+ `author-avatar`, `network`, `body`, `uid`, `owner-link`
+ FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
AND `guid` = ? AND `uid` = ? LIMIT 1", $a->argv[1], local_user());
if (dbm::is_result($r)) {
$nick = $a->user["nickname"];
}
}
+ // Is it an item with uid=0?
+ if (!dbm::is_result($r)) {
+ $r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
+ `author-avatar`, `network`, `body`, `uid`, `owner-link`
+ FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
+ AND `allow_cid` = '' AND `allow_gid` = ''
+ AND `deny_cid` = '' AND `deny_gid` = ''
+ AND NOT `private` AND `uid` = 0
+ AND `guid` = ? LIMIT 1", $a->argv[1]);
+ }
+
// Or is it anywhere on the server?
- if ($nick == "") {
- $r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent`, `item`.`author-name`,
- `item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body`
+ if (!dbm::is_result($r)) {
+ $r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`,
+ `item`.`author-avatar`, `item`.`network`, `item`.`body`, `item`.`uid`, `item`.`owner-link`
FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND NOT `item`.`private` AND NOT `user`.`hidewall`
AND `item`.`guid` = ? LIMIT 1", $a->argv[1]);
- if (dbm::is_result($r)) {
- $nick = $r["nickname"];
- $itemuid = $r["uid"];
- }
}
- // Is it an item with uid=0?
- if ($nick == "") {
- $r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`,
- `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body`
- FROM `item` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
- AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
- AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
- AND NOT `item`.`private` AND `item`.`uid` = 0
- AND `item`.`guid` = ? LIMIT 1", $a->argv[1]);
- }
if (dbm::is_result($r)) {
+
+ if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
+ logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG);
+ displayShowFeed($r["id"], false);
+ }
+
if ($r["id"] != $r["parent"]) {
$r = dba::fetch_first("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `id` = ?", $r["parent"]);
}
- if (($itemuid != local_user()) && local_user()) {
- // Do we know this contact but we haven't got this item?
- // Copy the wohle thread to our local storage so that we can interact.
- // We really should change this need for the future since it scales very bad.
- $contactid = get_contact($r['owner-link'], local_user());
- if ($contactid) {
- $items = dba::p("SELECT * FROM `item` WHERE `parent` = ? ORDER BY `id`", $r["id"]);
- while ($item = self::fetch($items)) {
- $itemcontactid = get_contact($item['owner-link'], local_user());
- if (!$itemcontactid) {
- $itemcontactid = $contactid;
- }
- unset($item['id']);
- $item['uid'] = local_user();
- $item['origin'] = 0;
- $item['contact-id'] = $itemcontactid;
- $local_copy = item_store($item, false, false, true);
- logger("Stored local copy for post ".$item['guid']." under id ".$local_copy, LOGGER_DEBUG);
- }
- dba::close($items);
- }
- }
$profiledata = display_fetchauthor($a, $r);
- if (strstr(normalise_link($profiledata["url"]), normalise_link(App::get_baseurl()))) {
- $nickname = str_replace(normalise_link(App::get_baseurl())."/profile/", "", normalise_link($profiledata["url"]));
+ if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) {
+ $nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($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`
$profiledata = get_contact_details_by_url($profiledata["url"], local_user(), $profiledata);
- $profiledata["photo"] = App::remove_baseurl($profiledata["photo"]);
+ $profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
if (local_user()) {
if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
- $profiledata["remoteconnect"] = App::get_baseurl()."/follow?url=".urlencode($profiledata["url"]);
+ $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
}
} elseif ($profiledata["network"] == NETWORK_DFRN) {
$connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
$nick = "";
if (local_user()) {
- $r = dba::fetch_first("SELECT `id` FROM `item`
+ $r = dba::fetch_first("SELECT `id`, `parent` 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"];
$nick = $a->user["nickname"];
}
}
if ($nick == "") {
- $r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
+ $r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND `item`.`guid` = ?", $a->argv[1]);
if (dbm::is_result($r)) {
$item_id = $r["id"];
+ $item_parent = $r["parent"];
$nick = $r["nickname"];
}
}
if ($nick == "") {
- $r = dba::fetch_first("SELECT `item`.`id` FROM `item`
+ $r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent` FROM `item`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND `item`.`guid` = ?", $a->argv[1]);
if (dbm::is_result($r)) {
$item_id = $r["id"];
+ $item_parent = $r["parent"];
}
}
}
}
if ($item_id && !is_numeric($item_id)) {
- $r = dba::select('item', array('id'), array('uri' => $item_id, 'uid' => $a->profile['uid']), array('limit' => 1));
+ $r = dba::select('item', array('id', 'parent'), array('uri' => $item_id, 'uid' => $a->profile['uid']), array('limit' => 1));
if (dbm::is_result($r)) {
$item_id = $r["id"];
+ $item_parent = $r["parent"];
} else {
$item_id = false;
}
}
// We are displaying an "alternate" link if that post was public. See issue 2864
- $items = dba::select('item', array('id'), array('id' => $item_id, 'private' => false, 'wall' => true));
- if (dbm::is_result($items)) {
- $alternate = App::get_baseurl().'/display/'.$nick.'/'.$item_id.'.atom';
+ $is_public = dba::exists('item', array('id' => $item_id, 'private' => false));
+ if ($is_public) {
+ $alternate = System::baseUrl().'/display/'.$nick.'/'.$item_id.'.atom';
+ $conversation = System::baseUrl().'/display/'.$nick.'/'.$item_parent.'/conversation.atom';
} else {
$alternate = '';
+ $conversation = '';
}
$a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'),
- array('$alternate' => $alternate));
+ array('$alternate' => $alternate,
+ '$conversation' => $conversation));
$groups = array();
$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
if ($update) {
- $r = dba::exists("SELECT `id` FROM `item` WHERE `item`.`uid` = ?
+ $r = dba::p("SELECT `id` FROM `item` WHERE `item`.`uid` = ?
AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
$sql_extra AND `unseen`",
$a->profile['uid'],
$item_id
);
- if (!$r) {
+ if (dba::num_rows($r) == 0) {
return '';
}
}
- $r = dba::p(item_query()." AND `item`.`uid` = ?
- AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
+ $r = dba::p(item_query()."AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
$sql_extra
ORDER BY `parent` DESC, `gravity` ASC, `id` ASC",
- $a->profile['uid'],
$item_id
);
return $o;
}
-
$r = dba::fetch_first("SELECT `id`,`deleted` FROM `item` WHERE `id` = ? OR `uri` = ? LIMIT 1",
$item_id,
$item_id
);
- if ($r) {
+ if (dbm::is_result($r)) {
if ($r['deleted']) {
notice(t('Item has been removed.') . EOL);
} else {
return $o;
}
+function displayShowFeed($item_id, $conversation) {
+ $xml = dfrn::itemFeed($item_id, $conversation);
+ if ($xml == '') {
+ http_status_exit(500);
+ }
+ header("Content-type: application/atom+xml");
+ echo $xml;
+ killme();
+}
projects / friendica.git / blobdiff