Use DI::baseUrl() for Search\Index.php

[friendica.git] / src / Module / Profile.php

diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index 60dc6aa1b447074910eb3438b61da7dd8bf6974d..8232282dfd56e5fe725c5cc2fbe7644cffbb7d1b 100644 (file)
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -14,11 +14,13 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact as ContactModel;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile as ProfileModel;
 use Friendica\Model\User;
+use Friendica\Module\Security\Login;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
@@ -35,7 +37,7 @@ class Profile extends BaseModule
 
        public static function init(array $parameters = [])
        {
-               $a = self::getApp();
+               $a = DI::app();
 
                // @TODO: Replace with parameter from router
                if ($a->argc < 2) {
@@ -77,7 +79,7 @@ class Profile extends BaseModule
 
        public static function content(array $parameters = [], $update = 0)
        {
-               $a = self::getApp();
+               $a = DI::app();
 
                if (!$update) {
                        ProfileModel::load($a, self::$which, self::$profile);
@@ -118,7 +120,7 @@ class Profile extends BaseModule
                        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/" title="' . L10n::t('%s\'s posts', $a->profile['username']) . '"/>' . "\n";
                        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/comments" title="' . L10n::t('%s\'s comments', $a->profile['username']) . '"/>' . "\n";
                        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/activity" title="' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\n";
-                       $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->getHostName() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''));
+                       $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . DI::baseUrl()->getHostname() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : ''));
                        $a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\n";
                        header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
@@ -131,12 +133,9 @@ class Profile extends BaseModule
 
                $category = $datequery = $datequery2 = '';
 
-               /** @var DateTimeFormat $dtFormat */
-               $dtFormat = self::getClass(DateTimeFormat::class);
-
                if ($a->argc > 2) {
                        for ($x = 2; $x < $a->argc; $x ++) {
-                               if ($dtFormat->isYearMonth($a->argv[$x])) {
+                               if (DI::dtFormat()->isYearMonth($a->argv[$x])) {
                                        if ($datequery) {
                                                $datequery2 = Strings::escapeHtml($a->argv[$x]);
                                        } else {
@@ -208,7 +207,7 @@ class Profile extends BaseModule
                                                || strlen($a->user['deny_cid'])
                                                || strlen($a->user['deny_gid'])
                                        ) ? 'lock' : 'unlock',
-                                       'acl' => $is_owner ? ACL::getFullSelectorHTML($a->user, true) : '',
+                                       'acl' => $is_owner ? ACL::getFullSelectorHTML($a->page, $a->user, true) : '',
                                        'bang' => '',
                                        'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
                                        'profile_uid' => $a->profile['profile_uid'],
@@ -259,7 +258,7 @@ class Profile extends BaseModule
                                return '';
                        }
 
-                       $pager = new Pager($a->query_string);
+                       $pager = new Pager(DI::args()->getQueryString());
                } else {
                        $sql_post_table = "";
 
@@ -291,7 +290,7 @@ class Profile extends BaseModule
 
                        //  check if we serve a mobile device and get the user settings
                        //  accordingly
-                       if ($a->is_mobile) {
+                       if (DI::mode()->isMobile()) {
                                $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network', 10);
                        } else {
                                $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network', 20);
@@ -303,7 +302,7 @@ class Profile extends BaseModule
                                $itemspage_network = $a->force_max_items;
                        }
 
-                       $pager = new Pager($a->query_string, $itemspage_network);
+                       $pager = new Pager(DI::args()->getQueryString(), $itemspage_network);
 
                        $pager_sql = sprintf(" LIMIT %d, %d ", $pager->getStart(), $pager->getItemsPerPage());
 
@@ -350,7 +349,7 @@ class Profile extends BaseModule
                $items = DBA::toArray($items_stmt);
 
                if ($pager->getStart() == 0 && !empty($a->profile['profile_uid'])) {
-                       $pinned_items = Item::selectPinned($a->profile['profile_uid'], ['uri']);
+                       $pinned_items = Item::selectPinned($a->profile['profile_uid'], ['uri', 'pinned'], ['true' . $sql_extra]);
                        $pinned = Item::inArray($pinned_items);
                        $items = array_merge($items, $pinned);
                }