X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdisplay.php;h=e615b68437b45fd8c9d44a8ae0b5a70e277812e8;hb=af6dbc654f82225cfc647fe2072662acae388e47;hp=919b12fbc3e2e0454f5c5b510844dc6feafb02aa;hpb=258683b49af514c925d732de2dcaf299cda68d04;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
index 919b12fbc3..e615b68437 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -11,6 +11,7 @@ use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\System;
+use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Group;
@@ -59,19 +60,19 @@ function display_init(App $a)
// Is it an item with uid=0?
if (!DBM::is_result($item)) {
- $item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => false, 'uid' => 0]);
+ $item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => [0, 2], 'uid' => 0]);
}
} elseif (($a->argc == 3) && ($nick == 'feed-item')) {
- $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => false, 'uid' => 0]);
+ $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => [0, 2], 'uid' => 0]);
}
- if (!DBM::is_result($item) || $item['deleted']) {
+ if (!DBM::is_result($item)) {
$a->error = 404;
notice(L10n::t('Item not found.') . EOL);
return;
}
- if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
+ 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);
}
@@ -86,7 +87,7 @@ function display_init(App $a)
$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`
+ $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
@@ -105,7 +106,7 @@ function display_init(App $a)
function display_fetchauthor($a, $item)
{
- $author = dba::selectFirst('contact', ['name', 'nick', 'photo', 'network', 'url'], ['id' => $item['author-id']]);
+ $author = DBA::selectFirst('contact', ['name', 'nick', 'photo', 'network', 'url'], ['id' => $item['author-id']]);
$profiledata = [];
$profiledata['uid'] = -1;
@@ -140,29 +141,29 @@ function display_fetchauthor($a, $item)
if (!$skip) {
$author = "";
preg_match("/author='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
}
preg_match('/author="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
}
$profile = "";
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profiledata["url"] = $matches[1];
}
preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profiledata["url"] = $matches[1];
}
$avatar = "";
preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profiledata["photo"] = $matches[1];
}
preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profiledata["photo"] = $matches[1];
}
$profiledata["nickname"] = $profiledata["name"];
@@ -202,7 +203,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
if ($update) {
$item_id = $_REQUEST['item_id'];
- $item = dba::selectFirst('item', ['uid', 'parent', 'parent-uri'], ['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 {
@@ -212,6 +213,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
$item_parent_uri = $item['parent-uri'];
} else {
$item_id = (($a->argc > 2) ? $a->argv[2] : 0);
+ $item_parent = $item_id;
if ($a->argc == 2) {
$item_parent = 0;
@@ -228,7 +230,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
}
if ($item_parent == 0) {
- $condition = ['private' => false, 'guid' => $a->argv[1], 'uid' => 0];
+ $condition = ['private' => [0, 2], 'guid' => $a->argv[1], 'uid' => 0];
$item = Item::selectFirstForUser(local_user(), $fields, $condition);
if (DBM::is_result($item)) {
$item_id = $item["id"];
@@ -246,7 +248,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
}
// We are displaying an "alternate" link if that post was public. See issue 2864
- $is_public = dba::exists('item', ['id' => $item_id, 'private' => false]);
+ $is_public = DBA::exists('item', ['id' => $item_id, 'private' => [0, 2]]);
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';
@@ -278,7 +280,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
if ($contact_id) {
$groups = Group::getIdsByContactId($contact_id);
- $remote_contact = dba::selectFirst('contact', [], ['id' => $contact_id, 'uid' => $a->profile['uid']]);
+ $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;
@@ -292,7 +294,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
}
}
- $page_contact = dba::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]);
+ $page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]);
if (DBM::is_result($page_contact)) {
$a->page_contact = $page_contact;
}
@@ -323,7 +325,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
if (local_user() && (local_user() == $a->profile['uid'])) {
$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
- $unseen = dba::exists('item', $condition);
+ $unseen = DBA::exists('item', $condition);
} else {
$unseen = false;
}
@@ -347,19 +349,20 @@ function display_content(App $a, $update = false, $update_uid = 0)
Item::update(['unseen' => false], $condition);
}
- $items = conv_sort(Item::inArray($items_obj), "`commented`");
+ $items = Item::inArray($items_obj);
+ $conversation_items = conv_sort($items, "`commented`");
if (!$update) {
$o .= "";
}
- $o .= conversation($a, $items, 'display', $update_uid, false, 'commented', local_user());
+ $o .= conversation($a, $conversation_items, 'display', $update_uid, false, 'commented', local_user());
// Preparing the meta header
- $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"];
+ $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;
@@ -391,7 +394,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";
@@ -401,7 +404,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