X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=6a07fa17622b631978b3c9e8e59a0f8baf6c1715;hb=ab5669e09190d05be8bfa62f2b82846631c2409d;hp=755c8b922e526f8f69b35150650a6db3d75ce64f;hpb=390d5706f46ce58cbed24b292d5c1f1b9789a8a8;p=friendica.git diff --git a/mod/display.php b/mod/display.php index 755c8b922e..6a07fa1762 100644 --- a/mod/display.php +++ b/mod/display.php @@ -1,20 +1,31 @@ argc > 1) ? $a->argv[1] : ''); - $profiledata = array(); + $profiledata = []; if ($a->argc == 3) { if (substr($a->argv[2], -5) == '.atom') { @@ -30,91 +41,80 @@ function display_init(App $a) { } } - $r = false; + $item = null; + + $fields = ['id', 'parent', 'author-id', 'body', 'uid']; // 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 = 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)) { + $item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]); + if (DBM::is_result($item)) { $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 NOT `private` AND `uid` = 0 - AND `guid` = ? LIMIT 1", $a->argv[1]); - } - - if (!DBM::is_result($r)) { - $a->error = 404; - notice(t('Item not found.') . EOL); - return; + if (!DBM::is_result($item)) { + $item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => false, 'uid' => 0]); } } 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]); + $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => false, 'uid' => 0]); } - 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 (!DBM::is_result($item) || $item['deleted']) { + $a->error = 404; + notice(L10n::t('Item not found.') . EOL); + return; + } - 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 (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) { + logger('Directly serving XML for id '.$item["id"], LOGGER_DEBUG); + displayShowFeed($item["id"], false); + } - $profiledata = display_fetchauthor($a, $r); + if ($item["id"] != $item["parent"]) { + $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]); + } - if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) { - $nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"])); + $profiledata = display_fetchauthor($a, $item); - 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"])) { + $profile = 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($profile)) { + $profiledata = $profile; } + $profiledata["network"] = NETWORK_DFRN; + } else { + $profiledata = []; } } - profile_load($a, $nick, 0, $profiledata); + Profile::load($a, $nick, 0, $profiledata); } -function display_fetchauthor($a, $item) { - $profiledata = array(); - $profiledata["uid"] = -1; - $profiledata["nickname"] = $item["author-name"]; - $profiledata["name"] = $item["author-name"]; - $profiledata["picdate"] = ""; - $profiledata["photo"] = $item["author-avatar"]; - $profiledata["url"] = $item["author-link"]; - $profiledata["network"] = $item["network"]; +function display_fetchauthor($a, $item) +{ + $author = dba::selectFirst('contact', ['name', 'nick', 'photo', 'network', 'url'], ['id' => $item['author-id']]); + + $profiledata = []; + $profiledata['uid'] = -1; + $profiledata['nickname'] = $author['nick']; + $profiledata['name'] = $author['name']; + $profiledata['picdate'] = ''; + $profiledata['photo'] = $author['photo']; + $profiledata['url'] = $author['url']; + $profiledata['network'] = $author['network']; // Check for a repeated message $skip = false; @@ -166,7 +166,7 @@ function display_fetchauthor($a, $item) { $profiledata["photo"] = $matches[1]; } $profiledata["nickname"] = $profiledata["name"]; - $profiledata["network"] = GetProfileUsername($profiledata["url"], "", false, true); + $profiledata["network"] = Protocol::matchByProfileUrl($profiledata["url"]); $profiledata["address"] = ""; $profiledata["about"] = ""; @@ -177,7 +177,7 @@ function display_fetchauthor($a, $item) { $profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]); if (local_user()) { - if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) { + 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) { @@ -188,47 +188,52 @@ function display_fetchauthor($a, $item) { return($profiledata); } -function display_content(App $a, $update = false, $update_uid = 0) { +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); + notice(L10n::t('Public access denied.') . EOL); return; } require_once 'include/security.php'; require_once 'include/conversation.php'; - require_once 'include/acl_selectors.php'; $o = ''; if ($update) { $item_id = $_REQUEST['item_id']; - $item = dba::select('item', ['uid', 'parent'], ['id' => $item_id], ['limit' => 1]); - $a->profile = array('uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])); + $item = dba::selectFirst('item', ['uid', 'parent', 'parent-uri'], ['id' => $item_id]); + if ($item['uid'] != 0) { + $a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])]; + } else { + $a->profile = ['uid' => intval($update_uid), '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); if ($a->argc == 2) { $item_parent = 0; + $fields = ['id', 'parent', 'parent-uri']; if (local_user()) { - $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"]; + $condition = ['guid' => $a->argv[1], 'uid' => local_user()]; + $item = Item::selectFirstForUser(local_user(), $fields, $condition); + if (DBM::is_result($item)) { + $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` 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"]; + $condition = ['private' => false, 'guid' => $a->argv[1], 'uid' => 0]; + $item = Item::selectFirstForUser(local_user(), $fields, $condition); + if (DBM::is_result($item)) { + $item_id = $item["id"]; + $item_parent = $item["parent"]; + $item_parent_uri = $item['parent-uri']; } } } @@ -236,12 +241,12 @@ function display_content(App $a, $update = false, $update_uid = 0) { if (!$item_id) { $a->error = 404; - notice(t('Item not found.').EOL); + notice(L10n::t('Item not found.').EOL); return; } // 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)); + $is_public = dba::exists('item', ['id' => $item_id, 'private' => false]); 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'; @@ -252,13 +257,13 @@ function display_content(App $a, $update = false, $update_uid = 0) { } $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), - array('$alternate' => $alternate, - '$conversation' => $conversation)); + ['$alternate' => $alternate, + '$conversation' => $conversation]); - $groups = array(); + $groups = []; $contact = null; - $remote_contact = false; + $is_remote_contact = false; $contact_id = 0; @@ -273,96 +278,85 @@ function display_content(App $a, $update = false, $update_uid = 0) { 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; + $remote_contact = dba::selectFirst('contact', [], ['id' => $contact_id, 'uid' => $a->profile['uid']]); + if (DBM::is_result($remote_contact)) { + $contact = $remote_contact; + $is_remote_contact = true; } } - if (!$remote_contact) { + if (!$is_remote_contact) { if (local_user()) { $contact_id = $_SESSION['cid']; $contact = $a->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; + $page_contact = dba::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]); + if (DBM::is_result($page_contact)) { + $a->page_contact = $page_contact; } $is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false); - if (x($a->profile, 'hidewall') && !$is_owner && !$remote_contact) { - notice(t('Access to this profile has been restricted.') . EOL); + if (x($a->profile, 'hidewall') && !$is_owner && !$is_remote_contact) { + notice(L10n::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( + $x = [ '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'), - 'acl' => populate_acl($a->user, true), + 'acl' => ACL::getFullSelectorHTML($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_permissions_sql($a->profile['uid'], $is_remote_contact, $groups); - if ($update) { - $r = dba::p("SELECT `id` FROM `item` WHERE - `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?) - $sql_extra AND `unseen`", - $item_id - ); - - if (dba::num_rows($r) == 0) { - return ''; - } + if (local_user() && (local_user() == $a->profile['uid'])) { + $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true]; + $unseen = dba::exists('item', $condition); + } else { + $unseen = false; + } + + if ($update && !$unseen) { + return ''; } - $r = dba::p(item_query()."AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?) - $sql_extra - ORDER BY `parent` DESC, `gravity` ASC, `id` ASC", - $item_id - ); + $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']]; + $items_obj = Item::selectForUser(local_user(), [], $condition, $params); - if (!DBM::is_result($r)) { - notice(t('Item not found.') . EOL); + if (!DBM::is_result($items_obj)) { + notice(L10n::t('Item not found.') . EOL); return $o; } - $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)); - } + if ($unseen) { + $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true]; + Item::update(['unseen' => false], $condition); } - $items = conv_sort($s, "`commented`"); + $items = conv_sort(dba::inArray($items_obj), "`commented`"); if (!$update) { $o .= ""; } - $o .= conversation($a, $items, 'display', $update_uid); + $o .= conversation($a, $items, 'display', $update_uid, false, 'commented', local_user()); // 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)); + $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"]; $image = $a->remove_baseurl($s[0]["author-thumb"]); @@ -415,10 +409,11 @@ function display_content(App $a, $update = false, $update_uid = 0) { return $o; } -function displayShowFeed($item_id, $conversation) { +function displayShowFeed($item_id, $conversation) +{ $xml = DFRN::itemFeed($item_id, $conversation); if ($xml == '') { - http_status_exit(500); + System::httpExit(500); } header("Content-type: application/atom+xml"); echo $xml;