From a9a19cb8e63a35da3314d0c73755483f33c361ee Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 19 Jun 2018 17:57:45 +0000
Subject: [PATCH] Display is reworked
---
mod/display.php | 101 +++++++++++++++++++++++-------------------------
1 file changed, 48 insertions(+), 53 deletions(-)
diff --git a/mod/display.php b/mod/display.php
index ff1ae6741b..8af52d6f33 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -41,59 +41,58 @@ function display_init(App $a)
}
}
- $r = false;
+ $item = false;
$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 = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => 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 = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => false, 'uid' => 0]);
+ 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 = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => false, 'uid' => 0]);
+ $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => false, 'uid' => 0]);
}
- if (!DBM::is_result($r) || $r['deleted']) {
+ if (!DBM::is_result($item) || $item['deleted']) {
$a->error = 404;
notice(L10n::t('Item not found.') . EOL);
return;
}
if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
- logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG);
- displayShowFeed($r["id"], false);
+ logger('Directly serving XML for id '.$item["id"], LOGGER_DEBUG);
+ displayShowFeed($item["id"], false);
}
- if ($r["id"] != $r["parent"]) {
- $r = Item::selectFirstForUser(local_user(), $fields, ['id' => $r["parent"]]);
+ if ($item["id"] != $item["parent"]) {
+ $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]);
}
- $profiledata = display_fetchauthor($a, $r);
+ $profiledata = display_fetchauthor($a, $item);
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`
+ $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($r)) {
- $profiledata = $r;
+ if (DBM::is_result($profile)) {
+ $profiledata = $profile;
}
$profiledata["network"] = NETWORK_DFRN;
} else {
@@ -104,7 +103,8 @@ function display_init(App $a)
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 = [];
@@ -188,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;
@@ -214,27 +215,25 @@ function display_content(App $a, $update = false, $update_uid = 0) {
if ($a->argc == 2) {
$item_parent = 0;
+ $fields = ['id', 'parent', 'parent-uri'];
if (local_user()) {
- $r = dba::fetch_first("SELECT `id`, `parent`, `parent-uri` 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"];
- $item_parent_uri = $r['parent-uri'];
+ $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`, `item`.`parent-uri` 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"];
- $item_parent_uri = $r['parent-uri'];
+ $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'];
}
}
}
@@ -264,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;
@@ -279,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;
}
@@ -323,7 +319,7 @@ 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 (local_user() && (local_user() == $a->profile['uid'])) {
$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
@@ -339,21 +335,19 @@ function display_content(App $a, $update = false, $update_uid = 0) {
$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']];
- $r = Item::selectForUser(local_user(), [], $condition, $params);
+ $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 ($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 .= "<script> var netargs = '?f=&item_id=" . $item_id . "'; </script>";
@@ -415,7 +409,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);