X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=012bc5e61a67cdc5732ee18dea3f792bc8d855f5;hb=343f22e02fc9540f41c61c318c554505d730e699;hp=4adb860f39ed29f1bfb87b7e980e1dc3e5471b1a;hpb=0ac725dc471d9541ec4fb40a8fbcf3982116eb64;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
index 4adb860f39..012bc5e61a 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,12 +1,15 @@
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);
}
}
+ $r = false;
+
// If there is only one parameter, then check if this parameter could be a guid
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)) {
+ if (DBM::is_result($r)) {
$nick = $a->user["nickname"];
- $itemuid = local_user();
}
}
+ // 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)) {
+ $a->error = 404;
+ notice(t('Item not found.') . EOL);
+ return;
+ }
+ } elseif (($a->argc == 3) && ($nick == '_feed_')) {
+ $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 `id` = ? LIMIT 1", $a->argv[2]);
+ }
+
+ 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 (dbm::is_result($r)) {
- 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::select('item', array(), array('parent' => $r["id"]), array('order' => array('id')));
- while ($item = dba::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 (($nickname != $a->user["nickname"])) {
- $r = dba::fetch_first("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",
- $nickname
- );
- if (dbm::is_result($r)) {
- $profiledata = $r;
- }
- $profiledata["network"] = NETWORK_DFRN;
- } else {
- $profiledata = array();
+ $profiledata = display_fetchauthor($a, $r);
+
+ 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`
+ 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",
+ $nickname
+ );
+ if (DBM::is_result($r)) {
+ $profiledata = $r;
}
+ $profiledata["network"] = NETWORK_DFRN;
+ } else {
+ $profiledata = array();
}
- } else {
- $a->error = 404;
- notice(t('Item not found.') . EOL);
- return;
}
}
@@ -128,8 +124,6 @@ function display_init(App $a) {
function display_fetchauthor($a, $item) {
- require_once("include/Contact.php");
-
$profiledata = array();
$profiledata["uid"] = -1;
$profiledata["nickname"] = $item["author-name"];
@@ -195,13 +189,13 @@ function display_fetchauthor($a, $item) {
$profiledata["about"] = "";
}
- $profiledata = get_contact_details_by_url($profiledata["url"], local_user(), $profiledata);
+ $profiledata = Contact::getDetailsByURL($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"]);
@@ -211,9 +205,9 @@ function display_fetchauthor($a, $item) {
return($profiledata);
}
-function display_content(App $a, $update = 0) {
+function display_content(App $a, $update = false, $update_uid = 0) {
- if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+ if (Config::get('system','block_public') && !local_user() && !remote_user()) {
notice(t('Public access denied.') . EOL);
return;
}
@@ -233,53 +227,59 @@ function display_content(App $a, $update = 0) {
if ($update) {
$item_id = $_REQUEST['item_id'];
- $a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
+ $item = dba::select('item', ['uid'], ['id' => $item_id], ['limit' => 1]);
+ $a->profile = array('uid' => intval($item['uid']), 'profile_uid' => intval($item['uid']));
} else {
$item_id = (($a->argc > 2) ? $a->argv[2] : 0);
if ($a->argc == 2) {
+ $item_parent = 0;
$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)) {
+ 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`
+ if ($item_parent == 0) {
+ $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 NOT `item`.`private` AND NOT `user`.`hidewall`
+ AND NOT `item`.`private` AND `item`.`uid` = 0
AND `item`.`guid` = ?", $a->argv[1]);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$item_id = $r["id"];
- $nick = $r["nickname"];
+ $item_parent = $r["parent"];
}
}
- if ($nick == "") {
- $r = dba::fetch_first("SELECT `item`.`id` FROM `item`
+ if ($item_parent == 0) {
+ $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 NOT `item`.`private` AND `item`.`uid` = 0
+ AND NOT `item`.`private` AND NOT `user`.`hidewall`
AND `item`.`guid` = ?", $a->argv[1]);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$item_id = $r["id"];
+ $item_parent = $r["parent"];
+ $nick = $r["nickname"];
}
}
}
}
if ($item_id && !is_numeric($item_id)) {
- $r = dba::select('item', array('id'), array('uri' => $item_id, 'uid' => $a->profile['uid']), array('limit' => 1));
- if (dbm::is_result($r)) {
+ $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;
}
@@ -292,15 +292,22 @@ function display_content(App $a, $update = 0) {
}
// We are displaying an "alternate" link if that post was public. See issue 2864
- $is_public = dba::exists('item', array('id' => $item_id, 'private' => false, 'wall' => true));
+ $is_public = dba::exists('item', array('id' => $item_id, 'private' => false));
if ($is_public) {
- $alternate = App::get_baseurl().'/display/'.$nick.'/'.$item_id.'.atom';
+ // For the atom feed the nickname doesn't matter at all, we only need the item id.
+ if ($nick == '') {
+ $nick = '_feed_';
+ }
+ $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();
@@ -324,7 +331,7 @@ function display_content(App $a, $update = 0) {
$contact_id,
$a->profile['uid']
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$contact = $r;
$remote_contact = true;
}
@@ -338,12 +345,12 @@ function display_content(App $a, $update = 0) {
}
$r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $a->profile['uid']);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$a->page_contact = $r;
}
- $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+ $is_owner = (local_user() && (local_user() == $a->profile['profile_uid']) ? true : false);
- if ($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+ if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
notice(t('Access to this profile has been restricted.') . EOL);
return;
}
@@ -369,10 +376,9 @@ function display_content(App $a, $update = 0) {
$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
if ($update) {
- $r = dba::p("SELECT `id` FROM `item` WHERE `item`.`uid` = ?
- AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
+ $r = dba::p("SELECT `id` FROM `item` WHERE
+ `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
$sql_extra AND `unseen`",
- $a->profile['uid'],
$item_id
);
@@ -381,15 +387,13 @@ function display_content(App $a, $update = 0) {
}
}
- $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
);
- if (!dbm::is_result($r) && local_user()) {
+ if (!DBM::is_result($r) && local_user()) {
// Check if this is another person's link to a post that we have
$r = dba::fetch_first("SELECT `item`.uri FROM `item`
WHERE (`item`.`id` = ? OR `item`.`uri` = ?)
@@ -397,7 +401,7 @@ function display_content(App $a, $update = 0) {
$item_id,
$item_id
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$item_uri = $r['uri'];
$r = dba::p(item_query()." AND `item`.`uid` = ?
@@ -410,12 +414,12 @@ function display_content(App $a, $update = 0) {
}
}
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$s = dba::inArray($r);
if ((local_user()) && (local_user() == $a->profile['uid'])) {
$unseen = dba::select('item', array('id'), array('parent' => $s[0]['parent'], 'unseen' => true), array('limit' => 1));
- if (dbm::is_result($unseen)) {
+ if (DBM::is_result($unseen)) {
dba::update('item', array('unseen' => false), array('parent' => $s[0]['parent'], 'unseen' => true));
}
}
@@ -425,7 +429,7 @@ function display_content(App $a, $update = 0) {
if (!$update) {
$o .= "";
}
- $o .= conversation($a, $items, 'display', $update);
+ $o .= conversation($a, $items, 'display', $update_uid);
// Preparing the meta header
require_once('include/bbcode.php');
@@ -465,7 +469,7 @@ function display_content(App $a, $update = 0) {
$a->page['htmlhead'] .= ''."\n";
$a->page['htmlhead'] .= ''."\n";
$a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ $a->page['htmlhead'] .= ''."\n";
$a->page['htmlhead'] .= ''."\n";
// Dublin Core
@@ -475,7 +479,7 @@ function display_content(App $a, $update = 0) {
// 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";
$a->page['htmlhead'] .= ''."\n";
@@ -483,12 +487,11 @@ function display_content(App $a, $update = 0) {
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 {
@@ -501,3 +504,12 @@ function display_content(App $a, $update = 0) {
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();
+}