X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=d5db5d7e9b113a19b873ff736755ad0395694576;hb=30a4b0eafb8c1947852c7a44f1c417481e9c49d3;hp=12fa8d7ecefb9c320e71b641b2f0e9af216cc2d0;hpb=98c12006d509f2ef4a98b06be04db7286c9da322;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
index 12fa8d7ece..d5db5d7e9b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -13,11 +13,10 @@ use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
-use Friendica\Core\System;
use Friendica\Core\Session;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
-use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\Profile;
use Friendica\Module\Objects;
@@ -93,13 +92,14 @@ function display_init(App $a)
}
if ($item["id"] != $item["parent"]) {
- $item = Item::selectFirstForUser($item_user, $fields, ['id' => $item["parent"]]);
+ $parent = Item::selectFirstForUser($item_user, $fields, ['id' => $item["parent"]]);
+ $item = $parent ?: $item;
}
$profiledata = display_fetchauthor($a, $item);
- if (strstr(Strings::normaliseLink($profiledata["url"]), Strings::normaliseLink(System::baseUrl()))) {
- $nickname = str_replace(Strings::normaliseLink(System::baseUrl())."/profile/", "", Strings::normaliseLink($profiledata["url"]));
+ if (strstr(Strings::normaliseLink($profiledata["url"]), Strings::normaliseLink(DI::baseUrl()))) {
+ $nickname = str_replace(Strings::normaliseLink(DI::baseUrl())."/profile/", "", Strings::normaliseLink($profiledata["url"]));
if ($nickname != $a->user["nickname"]) {
$profile = DBA::fetchFirst("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
@@ -133,51 +133,20 @@ function display_fetchauthor($a, $item)
$profiledata['network'] = $author['network'];
// Check for a repeated message
- $skip = false;
- $body = trim($item["body"]);
-
- // Skip if it isn't a pure repeated messages
- // Does it start with a share?
- if (!$skip && strpos($body, "[share") > 0) {
- $skip = true;
- }
- // Does it end with a share?
- if (!$skip && (strlen($body) > (strrpos($body, "[/share]") + 8))) {
- $skip = true;
- }
- if (!$skip) {
- $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
- // Skip if there is no shared message in there
- if ($body == $attributes) {
- $skip = true;
+ $shared = Item::getShareArray($item);
+ if (!empty($shared) && empty($shared['comment'])) {
+ if (!empty($shared['author'])) {
+ $profiledata['name'] = $shared['author'];
}
- }
- if (!$skip) {
- preg_match("/author='(.*?)'/ism", $attributes, $matches);
- if (!empty($matches[1])) {
- $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
- }
- preg_match('/author="(.*?)"/ism', $attributes, $matches);
- if (!empty($matches[1])) {
- $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
+ if (!empty($shared['profile'])) {
+ $profiledata['url'] = $shared['profile'];
}
- preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if (!empty($matches[1])) {
- $profiledata["url"] = $matches[1];
- }
- preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if (!empty($matches[1])) {
- $profiledata["url"] = $matches[1];
- }
- preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
- if (!empty($matches[1])) {
- $profiledata["photo"] = $matches[1];
- }
- preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
- if (!empty($matches[1])) {
- $profiledata["photo"] = $matches[1];
+
+ if (!empty($shared['avatar'])) {
+ $profiledata['photo'] = $shared['avatar'];
}
+
$profiledata["nickname"] = $profiledata["name"];
$profiledata["network"] = Protocol::matchByProfileUrl($profiledata["url"]);
@@ -188,7 +157,7 @@ function display_fetchauthor($a, $item)
$profiledata = Contact::getDetailsByURL($profiledata["url"], local_user(), $profiledata);
if (!empty($profiledata["photo"])) {
- $profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
+ $profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]);
}
return $profiledata;
@@ -202,6 +171,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
$o = '';
+ $item = null;
+
if ($update) {
$item_id = $_REQUEST['item_id'];
$item = Item::selectFirst(['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
@@ -251,7 +222,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
}
}
- if (!$item_id) {
+ if (empty($item)) {
throw new HTTPException\NotFoundException(L10n::t('The requested item doesn\'t exist or has been deleted.'));
}
@@ -259,30 +230,34 @@ function display_content(App $a, $update = false, $update_uid = 0)
$is_public = Item::exists(['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';
- $conversation = System::baseUrl().'/display/feed-item/'.$item_parent.'/conversation.atom';
+ $alternate = DI::baseUrl().'/display/feed-item/'.$item_id.'.atom';
+ $conversation = DI::baseUrl().'/display/feed-item/'.$item_parent.'/conversation.atom';
} else {
$alternate = '';
$conversation = '';
}
- $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('display-head.tpl'),
+ DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('display-head.tpl'),
['$alternate' => $alternate,
'$conversation' => $conversation]);
$is_remote_contact = false;
$item_uid = local_user();
- if (isset($item_parent_uri)) {
+ $parent = null;
+ if (!empty($item_parent_uri)) {
$parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
- if (DBA::isResult($parent)) {
- $a->profile['uid'] = ($a->profile['uid'] ?? 0) ?: $parent['uid'];
- $a->profile['profile_uid'] = ($a->profile['profile_uid'] ?? 0) ?: $parent['uid'];
- $is_remote_contact = Session::getRemoteContactID($a->profile['profile_uid']);
- if ($is_remote_contact) {
- $item_uid = $parent['uid'];
- }
+ }
+
+ if (DBA::isResult($parent)) {
+ $a->profile['uid'] = ($a->profile['uid'] ?? 0) ?: $parent['uid'];
+ $a->profile['profile_uid'] = ($a->profile['profile_uid'] ?? 0) ?: $parent['uid'];
+ $is_remote_contact = Session::getRemoteContactID($a->profile['profile_uid']);
+ if ($is_remote_contact) {
+ $item_uid = $parent['uid'];
}
+ } else {
+ $a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
}
$page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]);
@@ -304,7 +279,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' => ACL::getFullSelectorHTML($a->user, true),
+ 'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true),
'bang' => '',
'visitor' => 'block',
'profile_uid' => local_user(),
@@ -343,14 +318,14 @@ function display_content(App $a, $update = false, $update_uid = 0)
$o .= "";
}
- $o .= conversation($a, [$item], new Pager($a->query_string), 'display', $update_uid, false, 'commented', $item_uid);
+ $o .= conversation($a, [$item], new Pager(DI::args()->getQueryString()), 'display', $update_uid, false, 'commented', $item_uid);
// Preparing the meta header
$description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true));
$title = trim(HTML::toPlaintext(BBCode::convert($item["title"], false), 0, true));
$author_name = $item["author-name"];
- $image = $a->removeBaseURL($item["author-avatar"]);
+ $image = DI::baseUrl()->remove($item["author-avatar"]);
if ($title == "") {
$title = $author_name;
@@ -365,39 +340,41 @@ function display_content(App $a, $update = false, $update_uid = 0)
$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
+ $page = DI::page();
+
if (DBA::exists('contact', ['unsearchable' => true, 'id' => [$item['contact-id'], $item['author-id'], $item['owner-id']]])) {
- $a->page['htmlhead'] .= '' . "\n";
+ $page['htmlhead'] .= '' . "\n";
}
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ DI::page()['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
// Schema.org microdata
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $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";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
// Dublin Core
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $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";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
+ $page['htmlhead'] .= ''."\n";
// article:tag
return $o;