Merge remote-tracking branch 'upstream/develop' into item-notification

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index fa2127aaec247ddfea37ac678528a40104fc3971..d5db5d7e9b113a19b873ff736755ad0395694576 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -13,12 +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;
@@ -100,8 +98,8 @@ function display_init(App $a)
 
        $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`
@@ -159,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;
@@ -232,14 +230,14 @@ 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]);
 
@@ -281,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->page, $a->user, true),
+                       'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
@@ -342,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'] .= '<meta content="noindex, noarchive" name="robots" />' . "\n";
+               $page['htmlhead'] .= '<meta content="noindex, noarchive" name="robots" />' . "\n";
        }
 
-       $a->page['htmlhead'] .= '<meta name="author" content="'.$author_name.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="title" content="'.$title.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="fulltitle" content="'.$title.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="description" content="'.$description.'" />'."\n";
+       DI::page()['htmlhead'] .= '<meta name="author" content="'.$author_name.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="title" content="'.$title.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="fulltitle" content="'.$title.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="description" content="'.$description.'" />'."\n";
 
        // Schema.org microdata
-       $a->page['htmlhead'] .= '<meta itemprop="name" content="'.$title.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta itemprop="description" content="'.$description.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta itemprop="image" content="'.$image.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta itemprop="author" content="'.$author_name.'" />'."\n";
+       $page['htmlhead'] .= '<meta itemprop="name" content="'.$title.'" />'."\n";
+       $page['htmlhead'] .= '<meta itemprop="description" content="'.$description.'" />'."\n";
+       $page['htmlhead'] .= '<meta itemprop="image" content="'.$image.'" />'."\n";
+       $page['htmlhead'] .= '<meta itemprop="author" content="'.$author_name.'" />'."\n";
 
        // Twitter cards
-       $a->page['htmlhead'] .= '<meta name="twitter:card" content="summary" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="twitter:title" content="'.$title.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="twitter:description" content="'.$description.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="twitter:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$item["plink"].'" />'."\n";
+       $page['htmlhead'] .= '<meta name="twitter:card" content="summary" />'."\n";
+       $page['htmlhead'] .= '<meta name="twitter:title" content="'.$title.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="twitter:description" content="'.$description.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="twitter:image" content="'.DI::baseUrl().'/'.$image.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="twitter:url" content="'.$item["plink"].'" />'."\n";
 
        // Dublin Core
-       $a->page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="DC.description" content="'.$description.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="DC.description" content="'.$description.'" />'."\n";
 
        // Open Graph
-       $a->page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
-       $a->page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta property="og:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta property="og:url" content="'.$item["plink"].'" />'."\n";
-       $a->page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
+       $page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
+       $page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
+       $page['htmlhead'] .= '<meta property="og:image" content="'.DI::baseUrl().'/'.$image.'" />'."\n";
+       $page['htmlhead'] .= '<meta property="og:url" content="'.$item["plink"].'" />'."\n";
+       $page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
+       $page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
        // article:tag
 
        return $o;