X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=1f2e18708d90e073a809e8a4e9ffedeca33ab421;hb=c829e4372561660a1b7f365e3210cc7d49124642;hp=0cc15aa360bca636dc2aaa828c003df1fb53e701;hpb=29f7ebe307c22b275466390937b82ccb3820fb1c;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
index 0cc15aa360..1f2e18708d 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -5,6 +5,8 @@
use Friendica\App;
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\Protocol;
@@ -12,6 +14,7 @@ use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Group;
+use Friendica\Model\Item;
use Friendica\Model\Profile;
use Friendica\Protocol\DFRN;
@@ -38,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(L10n::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)) {
+ $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 (!empty($_SERVER['HTTP_ACCEPT']) && 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 = [];
+ 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);
}
-function display_fetchauthor($a, $item) {
+function display_fetchauthor($a, $item)
+{
+ $author = dba::selectFirst('contact', ['name', 'nick', 'photo', 'network', 'url'], ['id' => $item['author-id']]);
+
$profiledata = [];
- $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"];
+ $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;
@@ -196,7 +188,8 @@ 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(L10n::t('Public access denied.') . EOL);
return;
@@ -204,43 +197,43 @@ function display_content(App $a, $update = false, $update_uid = 0) {
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::selectFirst('item', ['uid', 'parent'], ['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'])];
} 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'];
}
}
}
@@ -270,7 +263,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
$groups = [];
$contact = null;
- $remote_contact = false;
+ $is_remote_contact = false;
$contact_id = 0;
@@ -285,30 +278,27 @@ 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) {
+ if (x($a->profile, 'hidewall') && !$is_owner && !$is_remote_contact) {
notice(L10n::t('Access to this profile has been restricted.') . EOL);
return;
}
@@ -321,7 +311,7 @@ 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' => populate_acl($a->user, true),
+ 'acl' => ACL::getFullSelectorHTML($a->user, true),
'bang' => '',
'visitor' => 'block',
'profile_uid' => local_user(),
@@ -329,55 +319,48 @@ function display_content(App $a, $update = false, $update_uid = 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'], $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;
}
- $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
- );
+ if ($update && !$unseen) {
+ 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']];
+ $items_obj = Item::selectForUser(local_user(), [], $condition, $params);
- if (!DBM::is_result($r)) {
+ 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::selectFirst('item', ['id'], ['parent' => $s[0]['parent'], 'unseen' => true]);
- if (DBM::is_result($unseen)) {
- dba::update('item', ['unseen' => false], ['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 = Item::inArray($items_obj);
+ $conversation_items = conv_sort($items, "`commented`");
if (!$update) {
$o .= "";
}
- $o .= conversation($a, $items, 'display', $update_uid);
+ $o .= conversation($a, $conversation_items, 'display', $update_uid, false, 'commented', local_user());
// Preparing the meta header
- require_once 'include/html2plain.php';
-
- $description = trim(html2plain(BBCode::convert($s[0]["body"], false), 0, true));
- $title = trim(html2plain(BBCode::convert($s[0]["title"], false), 0, true));
- $author_name = $s[0]["author-name"];
+ $description = trim(HTML::toPlaintext(BBCode::convert($items[0]["body"], false), 0, true));
+ $title = trim(HTML::toPlaintext(BBCode::convert($items[0]["title"], false), 0, true));
+ $author_name = $items[0]["author-name"];
- $image = $a->remove_baseurl($s[0]["author-thumb"]);
+ $image = $a->remove_baseurl($items[0]["author-avatar"]);
if ($title == "") {
$title = $author_name;
@@ -409,7 +392,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
$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";
@@ -419,7 +402,7 @@ function display_content(App $a, $update = false, $update_uid = 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";
$a->page['htmlhead'] .= ''."\n";
// article:tag
@@ -427,7 +410,8 @@ 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 == '') {
System::httpExit(500);