X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=2d91d2d1aed782d8036373ee7292e5bb497eb2bf;hb=9a3e773a9a0464a309e4891f40c1105c8e2fed33;hp=1ecff36182197a0e4b9392638c48e86912cbb924;hpb=a0530d1066d7268f1b1ea67bc3c254e9f9fc5ec8;p=friendica.git diff --git a/mod/display.php b/mod/display.php index 1ecff36182..2d91d2d1ae 100644 --- a/mod/display.php +++ b/mod/display.php @@ -1,13 +1,15 @@ argc == 3) { if (substr($a->argv[2], -5) == '.atom') { $item_id = substr($a->argv[2], 0, -5); - displayShowFeed($item_id); + 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? @@ -33,71 +43,63 @@ function display_init(App $a) { `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)) { + 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 (!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)) { + $a->error = 404; + notice(t('Item not found.') . EOL); + return; } + } elseif (($a->argc == 3) && ($nick == 'feed-item')) { + $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 NOT `private` AND `uid` = 0 + AND `id` = ? LIMIT 1", $a->argv[2]); + } - if (dbm::is_result($r)) { + 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 (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) { - logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG); - displayShowFeed($r["id"]); - } + 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 ($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"]); - } + $profiledata = display_fetchauthor($a, $r); - $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(); + 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; } } @@ -105,9 +107,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"]; @@ -173,7 +172,7 @@ 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"] = System::removedBaseUrl($profiledata["photo"]); @@ -189,80 +188,52 @@ function display_fetchauthor($a, $item) { return($profiledata); } -function display_content(App $a, $update = 0) { - - if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { +function display_content(App $a, $update = false, $update_uid = 0) { + if (Config::get('system','block_public') && !local_user() && !remote_user()) { notice(t('Public access denied.') . EOL); return; } - require_once('include/security.php'); - require_once('include/conversation.php'); - require_once('include/acl_selectors.php'); - + require_once 'include/security.php'; + require_once 'include/conversation.php'; + require_once 'include/acl_selectors.php'; $o = ''; - if ($update) { - $nick = $_REQUEST['nick']; - } else { - $nick = (($a->argc > 1) ? $a->argv[1] : ''); - } - if ($update) { $item_id = $_REQUEST['item_id']; - $a->profile = array('uid' => intval($update), 'profile_uid' => intval($update)); + $item = dba::select('item', ['uid', 'parent'], ['id' => $item_id], ['limit' => 1]); + $a->profile = array('uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])); + $item_parent = $item['parent']; } else { $item_id = (($a->argc > 2) ? $a->argv[2] : 0); if ($a->argc == 2) { - $nick = ""; + $item_parent = 0; 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"]; - $nick = $a->user["nickname"]; + $item_parent = $r["parent"]; } } - if ($nick == "") { - $r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id` 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` = ?", $a->argv[1]); - if (dbm::is_result($r)) { - $item_id = $r["id"]; - $nick = $r["nickname"]; - } - } - if ($nick == "") { - $r = dba::fetch_first("SELECT `item`.`id` FROM `item` + 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 `item`.`uid` = 0 AND `item`.`guid` = ?", $a->argv[1]); - if (dbm::is_result($r)) { + 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)); - if (dbm::is_result($r)) { - $item_id = $r["id"]; - } else { - $item_id = false; - } - } - if (!$item_id) { $a->error = 404; notice(t('Item not found.').EOL); @@ -272,13 +243,17 @@ 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)); if ($is_public) { - $alternate = System::baseUrl().'/display/'.$nick.'/'.$item_id.'.atom'; + // 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'; } else { $alternate = ''; + $conversation = ''; } $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), - array('$alternate' => $alternate)); + array('$alternate' => $alternate, + '$conversation' => $conversation)); $groups = array(); @@ -287,7 +262,7 @@ function display_content(App $a, $update = 0) { $contact_id = 0; - if (is_array($_SESSION['remote'])) { + if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) { foreach ($_SESSION['remote'] as $v) { if ($v['uid'] == $a->profile['uid']) { $contact_id = $v['cid']; @@ -297,12 +272,12 @@ function display_content(App $a, $update = 0) { } if ($contact_id) { - $groups = init_groups_visitor($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)) { + if (DBM::is_result($r)) { $contact = $r; $remote_contact = true; } @@ -316,25 +291,24 @@ 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() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false); - if ($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) { + if (x($a->profile, 'hidewall') && !$is_owner && !$remote_contact) { notice(t('Access to this profile has been restricted.') . EOL); return; } // We need the editor here to be able to reshare an item. - if ($is_owner) { $x = array( 'is_owner' => true, 'allow_location' => $a->user['allow_location'], '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'), + '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' => populate_acl($a->user, true), 'bang' => '', 'visitor' => 'block', @@ -344,13 +318,12 @@ function display_content(App $a, $update = 0) { $o .= status_editor($a,$x,0,true); } - $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups); + $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 ); @@ -365,119 +338,86 @@ function display_content(App $a, $update = 0) { $item_id ); - 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` = ?) - LIMIT 1", - $item_id, - $item_id - ); - if (dbm::is_result($r)) { - $item_uri = $r['uri']; - - $r = dba::p(item_query()." AND `item`.`uid` = ? - AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `uri` = ? AND uid = ?) - ORDER BY `parent` DESC, `gravity` ASC, `id` ASC", - local_user(), - $item_uri, - local_user() - ); - } + if (!DBM::is_result($r)) { + notice(t('Item not found.') . EOL); + return $o; } - 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)) { - dba::update('item', array('unseen' => false), array('parent' => $s[0]['parent'], 'unseen' => true)); - } - } - - $items = conv_sort($s, "`commented`"); + $s = dba::inArray($r); - if (!$update) { - $o .= ""; + 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)) { + dba::update('item', array('unseen' => false), array('parent' => $s[0]['parent'], 'unseen' => true)); } - $o .= conversation($a, $items, 'display', $update); - - // Preparing the meta header - require_once('include/bbcode.php'); - require_once("include/html2plain.php"); - $description = trim(html2plain(bbcode($s[0]["body"], false, false), 0, true)); - $title = trim(html2plain(bbcode($s[0]["title"], false, false), 0, true)); - $author_name = $s[0]["author-name"]; + } - $image = $a->remove_baseurl($s[0]["author-thumb"]); + $items = conv_sort($s, "`commented`"); - if ($title == "") { - $title = $author_name; - } + if (!$update) { + $o .= ""; + } + $o .= conversation($a, $items, 'display', $update_uid); - // Limit the description to 160 characters - if (strlen($description) > 160) { - $description = substr($description, 0, 157) . '...'; - } + // Preparing the meta header + require_once 'include/bbcode.php'; + require_once 'include/html2plain.php'; + $description = trim(html2plain(bbcode($s[0]["body"], false, false), 0, true)); + $title = trim(html2plain(bbcode($s[0]["title"], false, false), 0, true)); + $author_name = $s[0]["author-name"]; - $description = htmlspecialchars($description, ENT_COMPAT, 'UTF-8', true); // allow double encoding here - $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"; - - // Schema.org microdata - $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; - $a->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"; - - // Dublin Core - $a->page['htmlhead'] .= ''."\n"; - $a->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"; - // article:tag + $image = $a->remove_baseurl($s[0]["author-thumb"]); - return $o; + if ($title == "") { + $title = $author_name; } - $r = dba::fetch_first("SELECT `id`,`deleted` FROM `item` WHERE `id` = ? OR `uri` = ? LIMIT 1", - $item_id, - $item_id - ); - if (dbm::is_result($r)) { - if ($r['deleted']) { - notice(t('Item has been removed.') . EOL); - } else { - notice(t('Permission denied.') . EOL); - } - } else { - notice(t('Item not found.') . EOL); + + // Limit the description to 160 characters + if (strlen($description) > 160) { + $description = substr($description, 0, 157) . '...'; } + $description = htmlspecialchars($description, ENT_COMPAT, 'UTF-8', true); // allow double encoding here + $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"; + + // Schema.org microdata + $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; + $a->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"; + + // Dublin Core + $a->page['htmlhead'] .= ''."\n"; + $a->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"; + // article:tag + return $o; } -function displayShowFeed($item_id) { - $xml = dfrn::itemFeed($item_id); +function displayShowFeed($item_id, $conversation) { + $xml = DFRN::itemFeed($item_id, $conversation); if ($xml == '') { http_status_exit(500); }